[kernel] r12500 - dists/sid/linux-2.6/debian/config/arm

[Bastian Blank]

Author: waldi
Date: Wed Dec 10 16:00:16 2008
New Revision: 12500

Log:
debian/config/arm/config.versatile, debian/config/arm/config.orion5x:
Reorder.


Modified:
   dists/sid/linux-2.6/debian/config/arm/config.orion5x
   dists/sid/linux-2.6/debian/config/arm/config.versatile

Modified: dists/sid/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.orion5x	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.orion5x	Wed Dec 10 16:00:16 2008
@@ -141,11 +141,30 @@
 # CONFIG_PATA_SCH is not set
 
 ##
+## file: drivers/bluetooth/Kconfig
+##
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+
+##
 ## file: drivers/char/drm/Kconfig
 ##
 # CONFIG_DRM is not set
 
 ##
+## file: drivers/dma/Kconfig
+##
+CONFIG_DMADEVICES=y
+CONFIG_MV_XOR=y
+CONFIG_DMA_ENGINE=y
+# CONFIG_NET_DMA is not set
+
+##
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=y
@@ -318,6 +337,12 @@
 # CONFIG_ARCNET is not set
 
 ##
+## file: drivers/net/wireless/Kconfig
+##
+CONFIG_WLAN_PRE80211=y
+CONFIG_WLAN_80211=y
+
+##
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_PCI_LEGACY=y
@@ -489,38 +514,10 @@
 # CONFIG_DISPLAY_SUPPORT is not set
 
 ##
-## file: kernel/power/Kconfig
+## file: drivers/watchdog/Kconfig
 ##
-# CONFIG_PM is not set
-
-##
-## file: kernel/time/Kconfig
-##
-CONFIG_HIGH_RES_TIMERS=y
-
-##
-## file: mm/Kconfig
-##
-## choice: Memory model
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-## end choice
-# CONFIG_RESOURCES_64BIT is not set
-
-##
-## file: net/ax25/Kconfig
-##
-CONFIG_HAMRADIO=y
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-CONFIG_DMADEVICES=y
-CONFIG_MV_XOR=y
-CONFIG_DMA_ENGINE=y
-# CONFIG_NET_DMA is not set
+CONFIG_WATCHDOG=y
+CONFIG_ORION5X_WATCHDOG=m
 
 ##
 ## file: fs/Kconfig.binfmt
@@ -555,15 +552,24 @@
 CONFIG_EFI_PARTITION=y
 
 ##
-## file: net/x25/Kconfig
+## file: kernel/power/Kconfig
 ##
-CONFIG_X25=m
+# CONFIG_PM is not set
 
 ##
-## file: drivers/net/wireless/Kconfig
+## file: kernel/time/Kconfig
 ##
-CONFIG_WLAN_PRE80211=y
-CONFIG_WLAN_80211=y
+CONFIG_HIGH_RES_TIMERS=y
+
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+## end choice
+# CONFIG_RESOURCES_64BIT is not set
 
 ##
 ## file: net/atm/Kconfig
@@ -571,21 +577,21 @@
 CONFIG_ATM=m
 
 ##
+## file: net/ax25/Kconfig
+##
+CONFIG_HAMRADIO=y
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+##
 ## file: net/wanrouter/Kconfig
 ##
 CONFIG_WAN_ROUTER=m
 
 ##
-## file: drivers/bluetooth/Kconfig
+## file: net/x25/Kconfig
 ##
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIUART is not set
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-
-CONFIG_WATCHDOG=y
-CONFIG_ORION5X_WATCHDOG=m
+CONFIG_X25=m
 

Modified: dists/sid/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.versatile	Wed Dec 10 16:00:16 2008
@@ -73,13 +73,6 @@
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
 
 ##
-## Kernel Features
-##
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
@@ -349,6 +342,11 @@
 # CONFIG_PCCARD is not set
 
 ##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_PL031=y
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_SYM53C8XX_2=m
@@ -477,6 +475,13 @@
 # CONFIG_PM is not set
 
 ##
+## file: kernel/time/Kconfig
+##
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+
+##
 ## file: lib/Kconfig.debug
 ##
 CONFIG_ENABLE_WARN_DEPRECATED=y
@@ -538,8 +543,3 @@
 ##
 # CONFIG_X25 is not set
 
-##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_PL031=y
-