[kernel] r16416 - dists/trunk/linux-2.6/debian/config/kernelarch-x86
Ben Hutchings
benh at alioth.debian.org
Fri Oct 8 04:39:28 UTC 2010
Author: benh
Date: Fri Oct 8 04:39:21 2010
New Revision: 16416
Log:
Arrange drivers/staging/*/Kconfig in alphabetical order again
Modified:
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Oct 8 04:33:22 2010 (r16415)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Oct 8 04:39:21 2010 (r16416)
@@ -1077,6 +1077,12 @@
CONFIG_SFI=y
##
+## file: drivers/staging/brcm0211/Kconfig
+##
+CONFIG_BRCM80211=m
+CONFIG_BRCM80211_PCI=y
+
+##
## file: drivers/staging/comedi/Kconfig
##
CONFIG_COMEDI=m
@@ -1092,25 +1098,6 @@
# CONFIG_ET131X_DEBUG is not set
##
-## file: drivers/staging/pohmelfs/Kconfig
-##
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-
-##
-## file: drivers/staging/zram/Kconfig
-##
-CONFIG_ZRAM=m
-CONFIG_ZRAM_STATS=y
-
-##
-## file: drivers/staging/brcm0211/Kconfig
-##
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
-
-##
## file: drivers/staging/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
@@ -1128,6 +1115,13 @@
CONFIG_LIRC_ZILOG=m
##
+## file: drivers/staging/pohmelfs/Kconfig
+##
+CONFIG_POHMELFS=m
+# CONFIG_POHMELFS_DEBUG is not set
+CONFIG_POHMELFS_CRYPTO=y
+
+##
## file: drivers/staging/rtl8187se/Kconfig
##
CONFIG_R8187SE=m
@@ -1148,6 +1142,11 @@
CONFIG_RTL8192U=m
##
+## file: drivers/staging/samsung-laptop/Kconfig
+##
+CONFIG_SAMSUNG_LAPTOP=m
+
+##
## file: drivers/staging/tm6000/Kconfig
##
CONFIG_VIDEO_TM6000=m
@@ -1168,9 +1167,10 @@
CONFIG_PRISM2_USB=m
##
-## file: drivers/staging/samsung-laptop/Kconfi
+## file: drivers/staging/zram/Kconfig
##
-CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_STATS=y
##
## file: drivers/telephony/Kconfig
More information about the Kernel-svn-changes
mailing list