diff options
| -rw-r--r-- | arch/mips/ddb5074/pci.c | 7 | ||||
| -rw-r--r-- | arch/mips/ddb5074/setup.c | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/mips/ddb5074/pci.c b/arch/mips/ddb5074/pci.c index 0a7678850..1201b0ff4 100644 --- a/arch/mips/ddb5074/pci.c +++ b/arch/mips/ddb5074/pci.c @@ -320,6 +320,13 @@ int pcibios_enable_resources(struct pci_dev *dev) int idx; struct resource *r; + /* + * Don't touch the Nile 4 + */ + if (dev->vendor == PCI_VENDOR_ID_NEC && + dev->device == PCI_DEVICE_ID_NEC_NILE4) + return 0; + pci_read_config_word(dev, PCI_COMMAND, &cmd); old_cmd = cmd; for(idx=0; idx<6; idx++) { diff --git a/arch/mips/ddb5074/setup.c b/arch/mips/ddb5074/setup.c index d2f48c27f..151234512 100644 --- a/arch/mips/ddb5074/setup.c +++ b/arch/mips/ddb5074/setup.c @@ -18,6 +18,7 @@ #include <linux/mc146818rtc.h> #include <linux/pc_keyb.h> #include <linux/pci.h> +#include <linux/ide.h> #include <asm/addrspace.h> #include <asm/bcache.h> @@ -38,6 +39,7 @@ extern void breakpoint(void); extern void console_setup(char *); #endif +extern struct ide_ops std_ide_ops; extern struct rtc_ops ddb_rtc_ops; static void (*back_to_prom)(void) = (void (*)(void))0xbfc00000; @@ -107,6 +109,9 @@ void __init ddb_setup(void) _machine_halt = ddb_machine_halt; _machine_power_off = ddb_machine_power_off; +#ifdef CONFIG_BLK_DEV_IDE + ide_ops = &std_ide_ops; +#endif rtc_ops = &ddb_rtc_ops; /* Reboot on panic */ |