diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-10-15 18:16:10 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-15 18:16:10 -0700 |
| commit | a2bb28a0dbcc1370104a543d25eb28aab81d4a91 (patch) | |
| tree | af81c8fe399a5e828b584617ffe6ee3df9f6fc07 /drivers/spi | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| parent | f8631e7bba34d46d6ccea4cd90f7a0482770ff70 (diff) | |
| download | linux-a2bb28a0dbcc1370104a543d25eb28aab81d4a91.tar.gz linux-a2bb28a0dbcc1370104a543d25eb28aab81d4a91.tar.bz2 linux-a2bb28a0dbcc1370104a543d25eb28aab81d4a91.zip | |
Merge branch 'omap7xx-fortony-rc3' of git://robotfuzz.com/linwizard-kernel into omap7xx
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/omap_uwire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index e75ba9b28898..7bcf409792c7 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -52,7 +52,7 @@ #include <asm/mach-types.h> #include <mach/mux.h> -#include <mach/omap730.h> /* OMAP730_IO_CONF registers */ +#include <mach/omap7xx.h> /* OMAP7XX_IO_CONF registers */ /* FIXME address is now a platform device resource, @@ -504,7 +504,7 @@ static int __init uwire_probe(struct platform_device *pdev) } clk_enable(uwire->ck); - if (cpu_is_omap730()) + if (cpu_is_omap7xx()) uwire_idx_shift = 1; else uwire_idx_shift = 2; @@ -573,8 +573,8 @@ static int __init omap_uwire_init(void) } if (machine_is_omap_perseus2()) { /* configure pins: MPU_UW_nSCS1, MPU_UW_SDO, MPU_UW_SCLK */ - int val = omap_readl(OMAP730_IO_CONF_9) & ~0x00EEE000; - omap_writel(val | 0x00AAA000, OMAP730_IO_CONF_9); + int val = omap_readl(OMAP7XX_IO_CONF_9) & ~0x00EEE000; + omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9); } return platform_driver_probe(&uwire_driver, uwire_probe); |