From 9a7d455947dcf815d918e34e60c78f566c2cf2f8 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 7 Nov 2007 20:36:12 +0000 Subject: move a few config options to the generic templates to avoid kernel config questions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9510 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic-2.6/config-2.6.22 | 21 +++++++++++++++------ target/linux/generic-2.6/config-2.6.23 | 11 ++++++++++- target/linux/x86/config-2.6.23 | 6 ------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index fac26eba57..9db147e287 100644 --- a/target/linux/generic-2.6/config-2.6.22 +++ b/target/linux/generic-2.6/config-2.6.22 @@ -19,9 +19,9 @@ CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARPD=y CONFIG_ASK_IP_FIB_HASH=y # CONFIG_ATA is not set -# CONFIG_ATA_GENERIC is not set # CONFIG_ATALK is not set # CONFIG_ATARI_PARTITION is not set +# CONFIG_ATA_GENERIC is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_ATL1 is not set CONFIG_ATM=m @@ -89,9 +89,14 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_DELKIN is not set # CONFIG_BLK_DEV_FD is not set +# 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_IDECD is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEPNP is not set # CONFIG_BLK_DEV_IDESCSI is not set @@ -112,6 +117,7 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_PIIX is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RZ1000 is not set +# CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_SIIMAGE is not set # CONFIG_BLK_DEV_SIS5513 is not set @@ -124,6 +130,7 @@ CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set CONFIG_BLOCK=y # CONFIG_BNX2 is not set CONFIG_BONDING=m @@ -409,10 +416,12 @@ CONFIG_HZ_100=y # CONFIG_I2O is not set # CONFIG_I82092 is not set # CONFIG_ICPLUS_PHY is not set -CONFIG_IDE_MAX_HWIFS=4 # CONFIG_IDEDISK_MULTI_MODE is not set -# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_IDE_MAX_HWIFS=4 CONFIG_IDE_PROC_FS=y +# CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IEEE1394 is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_CRYPT_CCMP=m @@ -654,9 +663,9 @@ CONFIG_JOLIET=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_TRIGGER_MORSE is not set +CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LEGACY_PTYS is not set CONFIG_LIBCRC32C=m # CONFIG_LIBERTAS is not set @@ -975,6 +984,7 @@ CONFIG_PCI_HERMES=m # CONFIG_PCMCIA_WL3501 is not set # CONFIG_PCNET32 is not set # CONFIG_PD6729 is not set +# CONFIG_PDC_ADMA is not set # CONFIG_PHANTOM is not set # CONFIG_PHONE is not set # CONFIG_PHYLIB is not set @@ -1045,7 +1055,6 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RT_MUTEXES=y # CONFIG_S2IO is not set # CONFIG_SATA_AHCI is not set -# CONFIG_PDC_ADMA is not set # CONFIG_SATA_INIC162X is not set # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index af1dc9f7c0..363868c3d7 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -92,8 +92,13 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_DELKIN is not set # CONFIG_BLK_DEV_FD is not set +# 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_IDECD is not set # CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEPNP is not set @@ -115,6 +120,7 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_PIIX is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RZ1000 is not set +# CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_SIIMAGE is not set # CONFIG_BLK_DEV_SIS5513 is not set @@ -127,6 +133,7 @@ CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set CONFIG_BLOCK=y # CONFIG_BNX2 is not set CONFIG_BONDING=m @@ -417,6 +424,8 @@ CONFIG_HZ_100=y # CONFIG_I82092 is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDE_MAX_HWIFS=4 CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set @@ -1566,8 +1575,8 @@ CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y CONFIG_USB_SERIAL_SIERRAWIRELESS=m diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23 index 963069675c..d04514b161 100644 --- 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_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_IDEDMA_FORCED is not set CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_SC1200=y @@ -137,7 +132,6 @@ CONFIG_IDE=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 -- cgit v1.2.3