diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/spi/omap2_mcspi.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index ba1a872b221e..bf5f95a19413 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -35,8 +35,8 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/spi/spi.h> | 36 | #include <linux/spi/spi.h> |
| 37 | 37 | ||
| 38 | #include <mach/dma.h> | 38 | #include <plat/dma.h> |
| 39 | #include <mach/clock.h> | 39 | #include <plat/clock.h> |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | #define OMAP2_MCSPI_MAX_FREQ 48000000 | 42 | #define OMAP2_MCSPI_MAX_FREQ 48000000 |