Contents of /trunk/linux-libc-headers/patches/linux-2.6.21.3-mips_headers-1.patch
Parent Directory | Revision Log
Revision 642 -
(show annotations)
(download)
Tue Dec 18 00:23:39 2007 UTC (16 years, 9 months ago) by niro
File size: 2791 byte(s)
Tue Dec 18 00:23:39 2007 UTC (16 years, 9 months ago) by niro
File size: 2791 byte(s)
-synced with upstream
1 | diff -Naur linux-2.6.21.3/include/asm-mips/addrspace.h linux-mips-2.6.21.3/include/asm-mips/addrspace.h |
2 | --- linux-2.6.21.3/include/asm-mips/addrspace.h 2007-05-24 14:22:47.000000000 -0700 |
3 | +++ linux-mips-2.6.21.3/include/asm-mips/addrspace.h 2007-05-29 06:15:01.000000000 -0700 |
4 | @@ -133,6 +133,7 @@ |
5 | || defined (CONFIG_CPU_R4X00) \ |
6 | || defined (CONFIG_CPU_R5000) \ |
7 | || defined (CONFIG_CPU_RM7000) \ |
8 | + || defined (CONFIG_CPU_RM9000) \ |
9 | || defined (CONFIG_CPU_NEVADA) \ |
10 | || defined (CONFIG_CPU_TX49XX) \ |
11 | || defined (CONFIG_CPU_MIPS64) |
12 | 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 |
13 | --- linux-2.6.21.3/include/asm-mips/mach-generic/ide.h 2007-05-24 14:22:47.000000000 -0700 |
14 | +++ linux-mips-2.6.21.3/include/asm-mips/mach-generic/ide.h 2007-05-29 06:15:01.000000000 -0700 |
15 | @@ -29,17 +29,12 @@ |
16 | |
17 | #define IDE_ARCH_OBSOLETE_DEFAULTS |
18 | |
19 | +extern int mips_system_has_legacy_ide; |
20 | + |
21 | static __inline__ int ide_probe_legacy(void) |
22 | { |
23 | #ifdef CONFIG_PCI |
24 | - struct pci_dev *dev; |
25 | - if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL || |
26 | - (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) { |
27 | - pci_dev_put(dev); |
28 | - |
29 | - return 1; |
30 | - } |
31 | - return 0; |
32 | + return mips_system_has_legacy_ide; |
33 | #elif defined(CONFIG_EISA) || defined(CONFIG_ISA) |
34 | return 1; |
35 | #else |
36 | 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 |
37 | --- linux-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h 2007-05-24 14:22:47.000000000 -0700 |
38 | +++ linux-mips-2.6.21.3/include/asm-mips/mach-ip32/dma-coherence.h 2007-05-29 06:15:01.000000000 -0700 |
39 | @@ -6,8 +6,8 @@ |
40 | * Copyright (C) 2006 Ralf Baechle <ralf@linux-mips.org> |
41 | * |
42 | */ |
43 | -#ifndef __ASM_MACH_IP35_DMA_COHERENCE_H |
44 | -#define __ASM_MACH_IP35_DMA_COHERENCE_H |
45 | +#ifndef __ASM_MACH_IP32_DMA_COHERENCE_H |
46 | +#define __ASM_MACH_IP32_DMA_COHERENCE_H |
47 | |
48 | #include <asm/ip32/crime.h> |
49 | |
50 | @@ -69,4 +69,4 @@ |
51 | return 0; /* IP32 is non-cohernet */ |
52 | } |
53 | |
54 | -#endif /* __ASM_MACH_IP35_DMA_COHERENCE_H */ |
55 | +#endif /* __ASM_MACH_IP32_DMA_COHERENCE_H */ |
56 | 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 |
57 | --- linux-2.6.21.3/include/asm-mips/mips-boards/prom.h 2007-05-24 14:22:47.000000000 -0700 |
58 | +++ linux-mips-2.6.21.3/include/asm-mips/mips-boards/prom.h 2007-05-29 06:15:01.000000000 -0700 |
59 | @@ -33,6 +33,7 @@ |
60 | extern void prom_fixup_mem_map(unsigned long start_mem, unsigned long end_mem); |
61 | extern void mips_display_message(const char *str); |
62 | extern void mips_display_word(unsigned int num); |
63 | +extern void mips_scroll_message(void); |
64 | extern int get_ethernet_addr(char *ethernet_addr); |
65 | |
66 | /* Memory descriptor management. */ |