diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /arch/ppc/syslib/mpc83xx_devices.c | |
parent | Merge branch 'master' (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff) | |
download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/syslib/mpc83xx_devices.c')
-rw-r--r-- | arch/ppc/syslib/mpc83xx_devices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c index 95b3b8a7f0ba..dbf8acac507f 100644 --- a/arch/ppc/syslib/mpc83xx_devices.c +++ b/arch/ppc/syslib/mpc83xx_devices.c @@ -21,6 +21,7 @@ #include <asm/mpc83xx.h> #include <asm/irq.h> #include <asm/ppc_sys.h> +#include <asm/machdep.h> /* We use offsets for IORESOURCE_MEM since we do not know at compile time * what IMMRBAR is, will get fixed up by mach_mpc83xx_fixup |