debian/config: Cleanup.

svn path=/dists/trunk/linux-2.6/; revision=11682

debian/config/arm/config.orion5x

@@ -154,6 +154,16 @@ CONFIG_I2C_CHARDEV=y
 ##
 CONFIG_I2C_MV64XXX=y
 
+##
+## file: drivers/input/Kconfig
+##
+CONFIG_INPUT_EVDEV=m
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO=m
+
 ##
 ## file: drivers/media/Kconfig
 ##
@@ -476,6 +486,3 @@ CONFIG_ROSE=m
 CONFIG_MACH_MV2120=y
 CONFIG_MACH_TS409=y
 
-CONFIG_INPUT_EVDEV=m
-CONFIG_KEYBOARD_GPIO=m
-

debian/config/config

@@ -187,7 +187,6 @@ CONFIG_BT_HCIUART_LL=y
 ##
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_DEVKMEM=y
-CONFIG_COMPUTONE=m
 CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_RISCOM8=m
@@ -1320,7 +1319,6 @@ CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
 CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RS5C348=m
@@ -2601,3 +2599,9 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 ##
 CONFIG_INITRAMFS_SOURCE=""
 
+##
+## file: unknown
+##
+CONFIG_COMPUTONE=m
+CONFIG_RTC_DRV_FM3130=m
+

debian/config/i386/config.486

@@ -12,9 +12,7 @@ CONFIG_NOHIGHMEM=y
 CONFIG_MATH_EMULATION=y
 CONFIG_EISA=y
 CONFIG_MCA=y
-CONFIG_OLPC=y                                                                  
+CONFIG_OLPC=y
-CONFIG_PCI_OLPC=y                                                              
-
 
 ##
 ## file: arch/x86/Kconfig.cpu
@@ -121,9 +119,10 @@ CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
 CONFIG_SCSI_NCR53C8XX_SYNC=5
 CONFIG_SCSI_SIM710=m
 
-## file: drivers/video/geode/Kconfig                                           
+##
-##                                                                             
+## file: drivers/video/geode/Kconfig
-CONFIG_FB_GEODE_LX=y                                                           
+##
+CONFIG_FB_GEODE_LX=y
 
 ##
 ## file: init/Kconfig

debian/config/mips/config.r5k-ip32

@@ -148,6 +148,13 @@ CONFIG_GEN_RTC_X=y
 ##
 # CONFIG_FIREWIRE is not set
 
+##
+## file: drivers/hid/usbhid/Kconfig
+##
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+
 ##
 ## file: drivers/hwmon/Kconfig
 ##
@@ -536,6 +543,33 @@ CONFIG_SPI_BUTTERFLY=m
 ##
 # CONFIG_PHONE is not set
 
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB=m
+
+##
+## file: drivers/usb/class/Kconfig
+##
+CONFIG_USB_PRINTER=m
+
+##
+## file: drivers/usb/core/Kconfig
+##
+CONFIG_USB_DEVICEFS=y
+
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
+
+##
+## file: drivers/usb/storage/Kconfig
+##
+CONFIG_USB_STORAGE=m
+
 ##
 ## file: drivers/video/Kconfig
 ##
@@ -738,15 +772,3 @@ CONFIG_SND_KORG1212=m
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 
-CONFIG_USB=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB_DEVICEFS=y
-

debian/config/mips/config.sb1-bcm91250a

@@ -1087,5 +1087,3 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 
-#
-CONFIG_SB1250_MAC=y

debian/config/mips/config.sb1a-bcm91480b

@@ -1074,6 +1074,3 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 
-#
-CONFIG_SB1250_MAC=y
-

debian/config/mipsel/config.sb1-bcm91250a

@@ -1087,5 +1087,3 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 
-#
-CONFIG_SB1250_MAC=y

debian/config/mipsel/config.sb1a-bcm91480b

@@ -1073,6 +1073,3 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 
-#
-CONFIG_SB1250_MAC=y
-