diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-06 11:55:48 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-06 11:55:48 -0200 |
| commit | ce15c219696194cd6826205cb630e64cfb9c1c5b (patch) | |
| tree | d59fd775358e09bf90d842203d3f751c97b1f75a /libre/linux-libre/config.i686 | |
| parent | 387a6ac962ce6a21ccb27fa2cc494ea6e3d2b8cd (diff) | |
| parent | c1bff90faaaca75404032580f2ad5213ec76e893 (diff) | |
Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 5c6f3f62a..e6ffc0759 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.7.1-1 Kernel Configuration +# Linux/i386 3.7.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -503,7 +503,8 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_PM_TRACE_RTC is not set +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set @@ -869,6 +870,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m @@ -5142,7 +5144,7 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZCACHE=y +# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5222,6 +5224,7 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m +CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m @@ -5320,7 +5323,7 @@ CONFIG_MEMORY=y CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -5439,7 +5442,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m +CONFIG_CONFIGFS_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m |