[kernel] r19493 - in dists/trunk/linux/debian/config: . kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Sun Nov 11 11:31:07 2012
New Revision: 19493

Log:
debian/config: Automatically reorder config.

Modified:
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Nov 11 04:21:11 2012	(r19492)
+++ dists/trunk/linux/debian/config/config	Sun Nov 11 11:31:07 2012	(r19493)
@@ -3301,6 +3301,25 @@
 CONFIG_AFS_FSCACHE=y
 
 ##
+## file: fs/aufs/Kconfig
+##
+CONFIG_AUFS_FS=m
+## choice: Maximum number of branches
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+## end choice
+# CONFIG_AUFS_HNOTIFY is not set
+CONFIG_AUFS_EXPORT=y
+# CONFIG_AUFS_RDU is not set
+# CONFIG_AUFS_SP_IATTR is not set
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+# CONFIG_AUFS_BR_FUSE is not set
+# CONFIG_AUFS_DEBUG is not set
+
+##
 ## file: fs/autofs4/Kconfig
 ##
 CONFIG_AUTOFS4_FS=m
@@ -4802,19 +4821,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BR_FUSE is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_DEBUG is not set
-CONFIG_AUFS_EXPORT=y
-CONFIG_AUFS_FS=m
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_SP_IATTR is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Nov 11 04:21:11 2012	(r19492)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Nov 11 11:31:07 2012	(r19493)
@@ -1381,14 +1381,14 @@
 CONFIG_PRISM2_USB=m
 
 ##
-## file: drivers/staging/zsmalloc/Kconfig
+## file: drivers/staging/zram/Kconfig
 ##
-CONFIG_ZSMALLOC=m
+CONFIG_ZRAM=m
 
 ##
-## file: drivers/staging/zram/Kconfig
+## file: drivers/staging/zsmalloc/Kconfig
 ##
-CONFIG_ZRAM=m
+CONFIG_ZSMALLOC=m
 
 ##
 ## file: drivers/thermal/Kconfig