diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-12 12:03:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-12 12:03:42 -0400 |
commit | 8d97b84935b28ed8944d1be31859a3df7ebe93ae (patch) | |
tree | ed0f23dde45812aec86a9ff0c14df3477f9d136c /include/asm-mips/mach-au1x00/au1xxx.h | |
parent | 9f1a0735395ba2b2efa5012b5bf7f915299f1a79 (diff) | |
parent | cb0e8b0fba53e1aa6c4786bc465cfc641e8a77e7 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits)
[MIPS] Pb1000: bury the remnants of the PCI code
[MIPS] Fix build failure in mips oprofile code
[MIPS] fix warning message on SMP kernels
[MIPS] markeins: build fix
[MIPS] ELF handling - use SELFMAG instead of numeric constant
[MIPS] Get rid of __ilog2
[MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
[MIPS] XXS1500 code style cleanup
[MIPS] MTX-1 code style cleanup
[MIPS] Pb1200/DBAu1200 code style cleanup
[MIPS] Pb1550 code style cleanup
[MIPS] Pb1500 code style cleanup
[MIPS] Pb1100 code style cleanup
[MIPS] Pb1000 code style cleanup
[MIPS] DBAu1xx0 code style cleanup
[MIPS] Alchemy PCI code style cleanup
[MIPS] Alchemy common code style cleanup
[MIPS] Alchemy common headers style cleanup
[MIPS] Add empty argument parenthesis to GCC_IMM_ASM
[MIPS] msp_hwbutton.c: minor irq handler cleanups
...
Diffstat (limited to 'include/asm-mips/mach-au1x00/au1xxx.h')
-rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/mach-au1x00/au1xxx.h b/include/asm-mips/mach-au1x00/au1xxx.h index 947135941033..1b3655090ed3 100644 --- a/include/asm-mips/mach-au1x00/au1xxx.h +++ b/include/asm-mips/mach-au1x00/au1xxx.h | |||
@@ -23,10 +23,10 @@ | |||
23 | #ifndef _AU1XXX_H_ | 23 | #ifndef _AU1XXX_H_ |
24 | #define _AU1XXX_H_ | 24 | #define _AU1XXX_H_ |
25 | 25 | ||
26 | |||
27 | #include <asm/mach-au1x00/au1000.h> | 26 | #include <asm/mach-au1x00/au1000.h> |
28 | 27 | ||
29 | #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) | 28 | #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \ |
29 | defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) | ||
30 | #include <asm/mach-db1x00/db1x00.h> | 30 | #include <asm/mach-db1x00/db1x00.h> |
31 | 31 | ||
32 | #elif defined(CONFIG_MIPS_PB1550) | 32 | #elif defined(CONFIG_MIPS_PB1550) |