diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 12:19:24 +0200 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-ppc/ppc_sys.h | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
| download | kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.tar.gz kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.tar.bz2 kernel_samsung_smdk4412-da04b128cf0d74dd4cab270c53d9264e70f9203e.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc/ppc_sys.h')
| -rw-r--r-- | include/asm-ppc/ppc_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h index 24b991c4276..8ea62456623 100644 --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h @@ -27,6 +27,8 @@ #include <asm/mpc85xx.h> #elif defined(CONFIG_PPC_MPC52xx) #include <asm/mpc52xx.h> +#elif defined(CONFIG_MPC10X_BRIDGE) +#include <asm/mpc10x.h> #else #error "need definition of ppc_sys_devices" #endif |