diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-06 21:39:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-06 21:39:39 -0400 |
| commit | 38dbfc58450f5064f8534435ccc7b4c005bbfa68 (patch) | |
| tree | 829e9c277a024cf520db2b7bfaf7d5cb4fe5ba45 /kernels/linux-libre-xen/config.i686 | |
| parent | e1f7b97ab1603aea664ee3f392f6263fd7812b3c (diff) | |
| parent | d48da3adb2e5eaab66403aa3f0fce2d78f3ecd12 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-xen/config.i686')
| -rw-r--r-- | kernels/linux-libre-xen/config.i686 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index e6a221b4f..b1d41d390 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.3.0 Kernel Configuration +# Linux/i386 3.3.2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5120,7 +5120,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8712_AP=y CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m |