[kernel] generic-2.6/2.6.23: refresh patches

[openwrt.git] / target / linux / x86 / config-2.6.24

diff --git a/target/linux/x86/config-2.6.24 b/target/linux/x86/config-2.6.24
index 94e89e5..b606b0f 100644 (file)
--- a/target/linux/x86/config-2.6.24
+++ b/target/linux/x86/config-2.6.24
@@ -42,14 +42,12 @@ CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y

-# CONFIG_BLK_DEV_PLATFORM is not set

 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y

-# CONFIG_BT_HCIUART_LL is not set

 # CONFIG_BT_HIDP is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_BT_HIDP is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y


@@ -119,7 +117,6 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HIBERNATION_SMP_POSSIBLE=y
 CONFIG_HID=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HIBERNATION_SMP_POSSIBLE=y
 CONFIG_HID=y

-# CONFIG_HIDRAW is not set

 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set


@@ -182,7 +179,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set

-# CONFIG_LEDS_ALIX is not set

 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y


@@ -271,8 +267,8 @@ CONFIG_NETDEV_1000=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

+CONFIG_NF_CONNTRACK=y

 CONFIG_NOHIGHMEM=y
 CONFIG_NOHIGHMEM=y

-# CONFIG_NO_HZ is not set

 CONFIG_NR_CPUS=8
 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m
 CONFIG_NR_CPUS=8
 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m


@@ -280,11 +276,11 @@ CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PATA_CS5536 is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PATA_CS5536 is not set

-# CONFIG_PATA_NS87415 is not set

 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m

+CONFIG_PCI=y

 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_BIOS=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_BIOS=y


@@ -322,7 +318,6 @@ CONFIG_SC1200_WDT=m
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y

-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y


@@ -333,11 +328,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y

-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_I5K_AMB is not set

 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set


@@ -354,7 +344,6 @@ CONFIG_SLABINFO=y
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SND_AC97_CODEC=m

-# CONFIG_SND_CS5530 is not set

 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y


@@ -383,6 +372,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y

+CONFIG_USB=m

 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y


@@ -390,7 +380,6 @@ CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

-# CONFIG_USB_R8A66597_HCD is not set

 # CONFIG_USB_SERIAL_OTI6858 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set