summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/fsl_soc.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-28 07:56:11 +0200
committerPaul Mackerras <paulus@samba.org>2007-08-28 07:56:11 +0200
commit35438c4327df18dbf5e7f597b69299119f4a14de (patch)
treea4589d731015db93f2eba8f84ffb1f48a8084020 /arch/powerpc/sysdev/fsl_soc.c
parent[POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 (diff)
parentLinux 2.6.23-rc4 (diff)
downloadlinux-35438c4327df18dbf5e7f597b69299119f4a14de.tar.xz
linux-35438c4327df18dbf5e7f597b69299119f4a14de.zip
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
-rw-r--r--arch/powerpc/sysdev/fsl_soc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 565f57d777fe..f3abce11bead 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/platform_device.h>
+#include <linux/of_platform.h>
#include <linux/phy.h>
#include <linux/fsl_devices.h>
#include <linux/fs_enet_pd.h>