nas100d-kernel: PCI fixes from azummo

diff --git a/packages/linux/nas100d-kernel/2.6.14/defconfig b/packages/linux/nas100d-kernel/2.6.14/defconfig
index c6c9e51..a752d71 100644 (file)
--- a/packages/linux/nas100d-kernel/2.6.14/defconfig
+++ b/packages/linux/nas100d-kernel/2.6.14/defconfig
@@ -106,7 +106,7 @@ CONFIG_MACH_NAS100D=y
 #
 # IXP4xx Options
 #
-CONFIG_IXP4XX_INDIRECT_PCI=y
+# CONFIG_IXP4XX_INDIRECT_PCI is not set
 
 #
 # Processor Type
@@ -159,7 +159,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc x1205.hctosys=1 noirqdebug console=ttyS0,115200n8"
+CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc noirqdebug console=ttyS0,115200n8"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -905,7 +905,7 @@ CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
 # CONFIG_SENSORS_MAX6875 is not set
-CONFIG_SENSORS_X1205=y
+# CONFIG_SENSORS_X1205 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set

diff --git a/packages/linux/nas100d-kernel/2.6.14/nas100d-pci.c b/packages/linux/nas100d-kernel/2.6.14/nas100d-pci.c
index 8a8e472..1f93406 100644 (file)
--- a/packages/linux/nas100d-kernel/2.6.14/nas100d-pci.c
+++ b/packages/linux/nas100d-kernel/2.6.14/nas100d-pci.c
@@ -56,11 +56,11 @@ static int __init nas100d_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
                break;
        case 3:
                if (pin == 1)
-                       return IRQ_NAS100D_PCI_INTB;
-               if (pin == 2)
                        return IRQ_NAS100D_PCI_INTC;
-               if (pin == 3)
+               if (pin == 2)
                        return IRQ_NAS100D_PCI_INTD;
+               if (pin == 3)
+                       return IRQ_NAS100D_PCI_INTE;
                break;
        }