diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 21:55:27 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 21:55:27 -0400 |
| commit | 5b0504c0d795d6b0a904ff861c043d7a231f67a4 (patch) | |
| tree | c988e8b614c55d0dae2be4b750a03eb0a4f4d355 /drivers/spi | |
| parent | 930074b6b9c4895d20cdadba5aff97907e28728d (diff) | |
| parent | 77a76369475801ab8cbb338b9d8cfa92a491badb (diff) | |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/mpc52xx_psc_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index 681d62325d3d..604e5f0a2d95 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | 18 | ||
| 19 | #if defined(CONFIG_PPC_MERGE) | 19 | #if defined(CONFIG_PPC_MERGE) |
| 20 | #include <asm/of_platform.h> | 20 | #include <linux/of_platform.h> |
| 21 | #else | 21 | #else |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #endif | 23 | #endif |