summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-02 15:20:55 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-02 15:20:55 +1100
commitde2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch)
treedfccb1a2717a8a042a87dbade509f894810ea1cd /include/asm-ppc
parent104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff)
parentdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff)
downloadlinux-stable-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.gz
linux-stable-de2d3dbd17e6bb60bde4632ce1c7df063b073934.tar.bz2
linux-stable-de2d3dbd17e6bb60bde4632ce1c7df063b073934.zip
Merge ../linux-2.6
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/ppc_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
index 549f44843c5e..bba5305c29ed 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)