summaryrefslogtreecommitdiff
path: root/include/asm-ppc/ppc_sys.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 05:39:31 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 05:39:31 +0300
commitc2cc87ca9561ddfe744d446789cc10f507e87db9 (patch)
treed505fc0110eb1a3d8750ba2f67648c131f0d9aca /include/asm-ppc/ppc_sys.h
parentce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff)
parent7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff)
downloadlinux-c2cc87ca9561ddfe744d446789cc10f507e87db9.tar.xz
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc/ppc_sys.h')
-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)