diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 00:17:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 00:17:44 -0700 |
| commit | f4f988e28c2072292f8593edc7aff614fd35495c (patch) | |
| tree | 7f6e7d29ec2d55b111a5817bcc7748f0ec7b14b5 /include | |
| parent | f91e1227b98bbf09be7cfea50eb608b0fb639bd3 (diff) | |
| parent | 35820ceb46695ccaabaa666d65671489d732129b (diff) | |
Merge bk://linux-mtd.bkbits.net/sbc85xx-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mpc85xx.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h index 276a817065d8..aab7cb76aefa 100644 --- a/include/asm-ppc/mpc85xx.h +++ b/include/asm-ppc/mpc85xx.h @@ -25,6 +25,9 @@ #ifdef CONFIG_MPC8540_ADS #include <platforms/85xx/mpc8540_ads.h> #endif +#ifdef CONFIG_SBC8560 +#include <platforms/85xx/sbc8560.h> +#endif #define _IO_BASE isa_io_base #define _ISA_MEM_BASE isa_mem_base |