diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /arch/ppc/syslib/mpc52xx_devices.c | |
parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'arch/ppc/syslib/mpc52xx_devices.c')
-rw-r--r-- | arch/ppc/syslib/mpc52xx_devices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/syslib/mpc52xx_devices.c b/arch/ppc/syslib/mpc52xx_devices.c index ad5182efca1d..da3c74bfdc92 100644 --- a/arch/ppc/syslib/mpc52xx_devices.c +++ b/arch/ppc/syslib/mpc52xx_devices.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/fsl_devices.h> | 16 | #include <linux/fsl_devices.h> |
17 | #include <linux/resource.h> | 17 | #include <linux/resource.h> |
18 | #include <linux/platform_device.h> | ||
18 | #include <asm/mpc52xx.h> | 19 | #include <asm/mpc52xx.h> |
19 | #include <asm/ppc_sys.h> | 20 | #include <asm/ppc_sys.h> |
20 | 21 | ||