diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 18:02:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 18:02:14 -0500 |
| commit | 8348ad7c178627a302d579906096108b02052730 (patch) | |
| tree | 253a309819de4cd9d913594950e7c1764f7ba5c7 /include | |
| parent | 9948d378b99b06f6f34164dd8ff827e228ae9251 (diff) | |
| parent | 170c7ab58f41c526c54e9dd04044857d5d73f9e6 (diff) | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data
ARM: mach-shmobile: sh73a0 CPGA fix for PLL CFG bit
ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings
ARM: mach-shmobile: sh73a0 CPGA fix for IrDA MSTP
ARM: mach-shmobile: sh73a0 CPGA fix for FRQCRA M3
ARM: mach-shmobile: remove sh7367 on-chip set_irq_type()
ARM: mach-shmobile: sh7372 INTCS MFIS2 interrupt update
ARM: mach-shmobile: ag5evm: Add IrDA support
ARM: mach-shmobile: clock-sh7372: fixup pllc2 set_rate
mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors.
ARM: mach-shmobile: ag5evm requires GPIOLIB
ARM: mach-shmobile: fix cpu_base of gic_init() on sh73a0
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sh_mmcif.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index bf173502d744..38d393092812 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h | |||
| @@ -94,12 +94,12 @@ struct sh_mmcif_plat_data { | |||
| 94 | 94 | ||
| 95 | static inline u32 sh_mmcif_readl(void __iomem *addr, int reg) | 95 | static inline u32 sh_mmcif_readl(void __iomem *addr, int reg) |
| 96 | { | 96 | { |
| 97 | return readl(addr + reg); | 97 | return __raw_readl(addr + reg); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val) | 100 | static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val) |
| 101 | { | 101 | { |
| 102 | writel(val, addr + reg); | 102 | __raw_writel(val, addr + reg); |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | #define SH_MMCIF_BBS 512 /* boot block size */ | 105 | #define SH_MMCIF_BBS 512 /* boot block size */ |