[adm5120] fix compile errors in USB driver under 2.6.27

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

diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23
index 3be1259..73927c7 100644 (file)
--- a/target/linux/x86/config-2.6.23
+++ b/target/linux/x86/config-2.6.23
@@ -30,14 +30,9 @@ CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_GENERIC=y

-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set

 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y

-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_SC1200=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_SC1200=y


@@ -62,7 +57,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRYPTO_AES_586=m

-# CONFIG_CRYPTO_HW is not set

 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set


@@ -137,7 +131,6 @@ CONFIG_IDE=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y

-CONFIG_IDEPCI_SHARE_IRQ=y

 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y


@@ -279,6 +272,8 @@ CONFIG_PCMCIA=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y

+CONFIG_PCNET32=m
+CONFIG_PCNET32_NAPI=y

 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000


@@ -288,9 +283,6 @@ CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 CONFIG_PREEMPT_BKL=y
 CONFIG_QUICKLIST=y
 # CONFIG_PNP_DEBUG is not set
 CONFIG_PREEMPT_BKL=y
 CONFIG_QUICKLIST=y

-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-# CONFIG_R8169_VLAN is not set

 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y


@@ -358,7 +350,7 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m

-# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_MMIO=y

 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set
 # CONFIG_VIRTUALIZATION is not set