diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-02 04:20:55 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 04:20:55 (GMT) |
commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /include/asm-ppc | |
parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
download | linux-fsl-qoriq-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.xz |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-ppc')
-rw-r--r-- | include/asm-ppc/ppc_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h index 549f448..bba5305 100644 --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h @@ -18,7 +18,7 @@ #define __ASM_PPC_SYS_H #include <linux/init.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/types.h> #if defined(CONFIG_8260) |