diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 01:43:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 01:43:18 -0400 |
| commit | 2046219364a40bcb13482ff68eb6ccec13405633 (patch) | |
| tree | 5f4f951da5a0326318cd1abcd535ea40dc90c3b7 /arch/powerpc/sysdev/fsl_soc.c | |
| parent | 0c5564bd91ad237212871d52deaf79ffe06bcc64 (diff) | |
| parent | 0af666fa6cf4bc639fb6170600b5fb0d8b6504b9 (diff) | |
Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
* 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix 8xx compile failure
[POWERPC] Fix FSL BookE machine check reporting
[POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards
[POWERPC] Add interrupt resource for RTC CMOS driver
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 727453d3e8b9..1cf29c9d4408 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/of_platform.h> | ||
| 25 | #include <linux/phy.h> | 26 | #include <linux/phy.h> |
| 26 | #include <linux/fsl_devices.h> | 27 | #include <linux/fsl_devices.h> |
| 27 | #include <linux/fs_enet_pd.h> | 28 | #include <linux/fs_enet_pd.h> |