[kernel] r11682 - in dists/trunk/linux-2.6/debian/config: . arm i386 mips mipsel
Bastian Blank
waldi at alioth.debian.org
Sun Jun 22 10:09:32 UTC 2008
Author: waldi
Date: Sun Jun 22 10:09:31 2008
New Revision: 11682
Log:
debian/config: Cleanup.
Modified:
dists/trunk/linux-2.6/debian/config/arm/config.orion5x
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/i386/config.486
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x Sun Jun 22 10:09:31 2008
@@ -155,6 +155,16 @@
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
##
CONFIG_VIDEO_DEV=m
@@ -476,6 +486,3 @@
CONFIG_MACH_MV2120=y
CONFIG_MACH_TS409=y
-CONFIG_INPUT_EVDEV=m
-CONFIG_KEYBOARD_GPIO=m
-
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config (original)
+++ dists/trunk/linux-2.6/debian/config/config Sun Jun 22 10:09:31 2008
@@ -187,7 +187,6 @@
##
# 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_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_INITRAMFS_SOURCE=""
+##
+## file: unknown
+##
+CONFIG_COMPUTONE=m
+CONFIG_RTC_DRV_FM3130=m
+
Modified: dists/trunk/linux-2.6/debian/config/i386/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.486 (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config.486 Sun Jun 22 10:09:31 2008
@@ -12,9 +12,7 @@
CONFIG_MATH_EMULATION=y
CONFIG_EISA=y
CONFIG_MCA=y
-CONFIG_OLPC=y
-CONFIG_PCI_OLPC=y
-
+CONFIG_OLPC=y
##
## file: arch/x86/Kconfig.cpu
@@ -121,9 +119,10 @@
CONFIG_SCSI_NCR53C8XX_SYNC=5
CONFIG_SCSI_SIM710=m
-## file: drivers/video/geode/Kconfig
-##
-CONFIG_FB_GEODE_LX=y
+##
+## file: drivers/video/geode/Kconfig
+##
+CONFIG_FB_GEODE_LX=y
##
## file: init/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Sun Jun 22 10:09:31 2008
@@ -149,6 +149,13 @@
# 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
##
CONFIG_HWMON=y
@@ -537,6 +544,33 @@
# 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
##
CONFIG_FB=y
@@ -738,15 +772,3 @@
# 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
-
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Sun Jun 22 10:09:31 2008
@@ -1087,5 +1087,3 @@
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-#
-CONFIG_SB1250_MAC=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Sun Jun 22 10:09:31 2008
@@ -1074,6 +1074,3 @@
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-#
-CONFIG_SB1250_MAC=y
-
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Sun Jun 22 10:09:31 2008
@@ -1087,5 +1087,3 @@
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-#
-CONFIG_SB1250_MAC=y
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Sun Jun 22 10:09:31 2008
@@ -1073,6 +1073,3 @@
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
-#
-CONFIG_SB1250_MAC=y
-
More information about the Kernel-svn-changes
mailing list