disapproval of revision '20f5c236b9ebdf5e2fc0e5acea55f39e77588bb8'

1 files changed, 57 insertions, 60 deletions

diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
index e7973518c7..25c2ba40c2 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16-rc2
-# Thu Feb  9 23:00:47 2006
+# Thu Feb  9 20:54:57 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -124,7 +124,6 @@ CONFIG_ARCH_IXDP425=y
 CONFIG_ARCH_IXCDP1100=y
 # CONFIG_ARCH_PRPMC1100 is not set
 CONFIG_MACH_NAS100D=y
-CONFIG_MACH_DS101=y
 CONFIG_ARCH_IXDP4XX=y
 # CONFIG_MACH_GTWX5715 is not set
 
@@ -584,7 +583,60 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 #
 # ATA/ATAPI/MFM/RLL support
 #
-# CONFIG_IDE is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_PCI_AUTO is not set
+CONFIG_BLK_DEV_AEC62XX=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
 # SCSI device support
@@ -634,53 +686,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
-# CONFIG_SCSI_SATA_SVW is not set
-# CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_SATA_MV is not set
-# CONFIG_SCSI_SATA_NV is not set
-# CONFIG_SCSI_PDC_ADMA is not set
-# CONFIG_SCSI_SATA_QSTOR is not set
-# CONFIG_SCSI_SATA_PROMISE is not set
-# CONFIG_SCSI_SATA_SX4 is not set
-# CONFIG_SCSI_SATA_SIL is not set
-# CONFIG_SCSI_SATA_SIL24 is not set
-# CONFIG_SCSI_SATA_SIS is not set
-# CONFIG_SCSI_SATA_ULI is not set
-# CONFIG_SCSI_SATA_VIA is not set
-# CONFIG_SCSI_SATA_VITESSE is not set
-# CONFIG_SCSI_PATA_ALI is not set
-# CONFIG_SCSI_PATA_AMD is not set
-CONFIG_SCSI_PATA_ARTOP=y
-# CONFIG_SCSI_PATA_ATIIXP is not set
-# CONFIG_SCSI_PATA_CMD64X is not set
-# CONFIG_SCSI_PATA_CS5520 is not set
-# CONFIG_SCSI_PATA_CS5530 is not set
-# CONFIG_SCSI_PATA_CYPRESS is not set
-# CONFIG_SCSI_PATA_EFAR is not set
-# CONFIG_SCSI_ATA_GENERIC is not set
-# CONFIG_SCSI_PATA_HPT37X is not set
-# CONFIG_SCSI_PATA_HPT3X2N is not set
-# CONFIG_SCSI_PATA_HPT3X3 is not set
-# CONFIG_SCSI_PATA_ISAPNP is not set
-# CONFIG_SCSI_PATA_IT8172 is not set
-# CONFIG_SCSI_PATA_IT821X is not set
-# CONFIG_SCSI_PATA_LEGACY is not set
-# CONFIG_SCSI_PATA_MPIIX is not set
-# CONFIG_SCSI_PATA_NETCELL is not set
-# CONFIG_SCSI_PATA_OLDPIIX is not set
-# CONFIG_SCSI_PATA_OPTI is not set
-# CONFIG_SCSI_PATA_PCMCIA is not set
-# CONFIG_SCSI_PATA_QDI is not set
-# CONFIG_SCSI_PATA_RZ1000 is not set
-# CONFIG_SCSI_PATA_SC1200 is not set
-# CONFIG_SCSI_PATA_SERVERWORKS is not set
-# CONFIG_SCSI_PATA_SIL680 is not set
-# CONFIG_SCSI_PATA_SIS is not set
-# CONFIG_SCSI_PATA_TRIFLEX is not set
-# CONFIG_SCSI_PATA_VIA is not set
-# CONFIG_SCSI_PATA_WINBOND is not set
+# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
@@ -1088,16 +1094,6 @@ CONFIG_HWMON=y
 #
 
 #
-# LED devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_IXP4XX=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y
-
-#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
@@ -1298,6 +1294,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
 # CONFIG_USB_STORAGE_DPCM is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set