diff -Naur linux-2.6.21.3/include/asm-mips/addrspace.h linux-mips-2.6.21.3/include/asm-mips/addrspace.h --- linux-2.6.21.3/include/asm-mips/addrspace.h 2007-05-24 14:22:47.000000000 -0700 +++ linux-mips-2.6.21.3/include/asm-mips/addrspace.h 2007-05-29 06:15:01.000000000 -0700 @@ -133,6 +133,7 @@ || defined (CONFIG_CPU_R4X00) \ || defined (CONFIG_CPU_R5000) \ || defined (CONFIG_CPU_RM7000) \ + || defined (CONFIG_CPU_RM9000) \ || defined (CONFIG_CPU_NEVADA) \ || defined (CONFIG_CPU_TX49XX) \ || defined (CONFIG_CPU_MIPS64) diff -Naur linux-2.6.21.3/include/asm-mips/mach-generic/ide.h linux-mips-2.6.21.3/include/asm-mips/mach-generic/ide.h --- linux-2.6.21.3/include/asm-mips/mach-generic/ide.h 2007-05-24 14:22:47.000000000 -0700 +++ linux-mips-2.6.21.3/include/asm-mips/mach-generic/ide.h 2007-05-29 06:15:01.000000000 -0700 @@ -29,17 +29,12 @@ #define IDE_ARCH_OBSOLETE_DEFAULTS +extern int mips_system_has_legacy_ide; + static __inline__ int ide_probe_legacy(void) { #ifdef CONFIG_PCI - struct pci_dev *dev; - if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL || - (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) { - pci_dev_put(dev); - - return 1; - } - return 0; + return mips_system_has_legacy_ide; #elif defined(CONFIG_EISA) || defined(CONFIG_ISA) return 1; #else diff -Naur linux-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h linux-mips-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h --- linux-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h 2007-05-24 14:22:47.000000000 -0700 +++ linux-mips-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h 2007-05-29 06:15:01.000000000 -0700 @@ -6,8 +6,8 @@ * Copyright (C) 2006 Ralf Baechle * */ -#ifndef __ASM_MACH_IP35_DMA_COHERENCE_H -#define __ASM_MACH_IP35_DMA_COHERENCE_H +#ifndef __ASM_MACH_IP32_DMA_COHERENCE_H +#define __ASM_MACH_IP32_DMA_COHERENCE_H #include @@ -69,4 +69,4 @@ return 0; /* IP32 is non-cohernet */ } -#endif /* __ASM_MACH_IP35_DMA_COHERENCE_H */ +#endif /* __ASM_MACH_IP32_DMA_COHERENCE_H */ diff -Naur linux-2.6.21.3/include/asm-mips/mips-boards/prom.h linux-mips-2.6.21.3/include/asm-mips/mips-boards/prom.h --- linux-2.6.21.3/include/asm-mips/mips-boards/prom.h 2007-05-24 14:22:47.000000000 -0700 +++ linux-mips-2.6.21.3/include/asm-mips/mips-boards/prom.h 2007-05-29 06:15:01.000000000 -0700 @@ -33,6 +33,7 @@ extern void prom_fixup_mem_map(unsigned long start_mem, unsigned long end_mem); extern void mips_display_message(const char *str); extern void mips_display_word(unsigned int num); +extern void mips_scroll_message(void); extern int get_ethernet_addr(char *ethernet_addr); /* Memory descriptor management. */