[kernel] r18711 - in dists/sid/linux-2.6/debian/config: alpha armel kernelarch-x86 mips sparc

[Bastian Blank]

Author: waldi
Date: Mon Feb 20 13:14:11 2012
New Revision: 18711

Log:
debian/config: Automatically reorder config.

Modified:
   dists/sid/linux-2.6/debian/config/alpha/config
   dists/sid/linux-2.6/debian/config/armel/config
   dists/sid/linux-2.6/debian/config/armel/config.mv78xx0
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
   dists/sid/linux-2.6/debian/config/mips/config.octeon
   dists/sid/linux-2.6/debian/config/sparc/config

Modified: dists/sid/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/alpha/config	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/alpha/config	Mon Feb 20 13:14:11 2012	(r18711)
@@ -69,9 +69,9 @@
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_VIA=m
+CONFIG_PATA_ISAPNP=y
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_ISAPNP=y
 CONFIG_PATA_LEGACY=m
 
 ##

Modified: dists/sid/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/armel/config	Mon Feb 20 13:14:11 2012	(r18711)
@@ -114,4 +114,3 @@
 ##
 # CONFIG_SECURITY_TOMOYO is not set
 
-

Modified: dists/sid/linux-2.6/debian/config/armel/config.mv78xx0
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.mv78xx0	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/armel/config.mv78xx0	Mon Feb 20 13:14:11 2012	(r18711)
@@ -1,8 +1,8 @@
 ##
 ## file: arch/arm/Kconfig
 ##
-## choice: ARM system type
 CONFIG_MMU=y
+## choice: ARM system type
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
@@ -20,8 +20,8 @@
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_ORION5X is not set
 CONFIG_ARCH_MV78XX0=y
+# CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
@@ -33,6 +33,7 @@
 # CONFIG_ARCH_OMAP is not set
 ## end choice
 CONFIG_PCI=y
+CONFIG_HIGHMEM=y
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@@ -47,7 +48,6 @@
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_VFP=y
 # CONFIG_ARTHUR is not set
-CONFIG_HIGHMEM=y
 
 ##
 ## file: arch/arm/mach-mv78xx0/Kconfig

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Mon Feb 20 13:14:11 2012	(r18711)
@@ -67,7 +67,6 @@
 # CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
 
 ##

Modified: dists/sid/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.octeon	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/mips/config.octeon	Mon Feb 20 13:14:11 2012	(r18711)
@@ -93,10 +93,6 @@
 CONFIG_OCTEON_MGMT_ETHERNET=y
 
 ##
-## file: drivers/net/phy/Kconfig
-##
-
-##
 ## file: drivers/rtc/Kconfig
 ##
 CONFIG_RTC_DRV_DS1307=y

Modified: dists/sid/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/sparc/config	Mon Feb 20 12:53:32 2012	(r18710)
+++ dists/sid/linux-2.6/debian/config/sparc/config	Mon Feb 20 13:14:11 2012	(r18711)
@@ -20,18 +20,17 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
-CONFIG_PATA_LEGACY=m
 CONFIG_PATA_ALI=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_PDC202XX_OLD=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_VIA=m
 CONFIG_PATA_NS87410=m
+CONFIG_PATA_LEGACY=m
 
 ##
 ## file: drivers/block/Kconfig
@@ -687,4 +686,5 @@
 ##
 CONFIG_MYRI_SBUS=m
 CONFIG_NET_PCI=y
+CONFIG_PATA_PDC202XX_OLD=m