diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 20:07:10 +0100 |
---|---|---|
committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 20:07:10 +0100 |
commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /include/asm-mips/mach-db1x00/db1200.h | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
parent | Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff) | |
download | linux-9ef64cb4320df821638b508f79aa8b858cca99f0.tar.xz linux-9ef64cb4320df821638b508f79aa8b858cca99f0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/mach-db1x00/db1200.h')
-rw-r--r-- | include/asm-mips/mach-db1x00/db1200.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h index 050eae87ff01..a6bdac61ab49 100644 --- a/include/asm-mips/mach-db1x00/db1200.h +++ b/include/asm-mips/mach-db1x00/db1200.h @@ -25,6 +25,7 @@ #define __ASM_DB1200_H #include <linux/types.h> +#include <asm/mach-au1x00/au1xxx_psc.h> // This is defined in au1000.h with bogus value #undef AU1X00_EXTERNAL_INT |