diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:54:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:54:27 -0500 |
| commit | 64d497f55379b1e320a08ec2426468d96f5642ec (patch) | |
| tree | 22b9ab3c5e69c5cc2728cbc2ca7fc7623beef8f1 /arch/sh/include/mach-common/mach/magicpanelr2.h | |
| parent | 37d4008484977f60d5d37499a2670c79b214dd46 (diff) | |
| parent | b5f5fe80fa98a60daa0fa94512d1599b1e26674c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
sh: remove dead LED code for migo-r and ms7724se
sh: ecovec build fix for CONFIG_I2C=n
sh: ecovec r-standby support
sh: ms7724se r-standby support
sh: SH-Mobile R-standby register save/restore
clocksource: Fix up a registration/IRQ race in the sh drivers.
sh: ms7724: modify scan_timing for KEYSC
sh: ms7724: Add sh_sir support
sh: mach-ecovec24: Add sh_sir support
sh: wire up SET/GET_UNALIGN_CTL.
sh: allow alignment fault mode to be configured at kernel boot.
sh: sh7724: Update FSI/SPU2 clock
sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
sh: add sh7724 kick callback to clk_div4_table
sh: introduce struct clk_div4_table
sh: clock-cpg div4 set_rate() shift fix
sh: Turn on speculative return for SH7785 and SH7786
sh: Merge legacy and dynamic PMB modes.
sh: Use uncached I/O helpers in PMB setup.
sh: Provide uncached I/O helpers.
...
Diffstat (limited to 'arch/sh/include/mach-common/mach/magicpanelr2.h')
| -rw-r--r-- | arch/sh/include/mach-common/mach/magicpanelr2.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/include/mach-common/mach/magicpanelr2.h b/arch/sh/include/mach-common/mach/magicpanelr2.h index c644a77ee35..183a2f74425 100644 --- a/arch/sh/include/mach-common/mach/magicpanelr2.h +++ b/arch/sh/include/mach-common/mach/magicpanelr2.h | |||
| @@ -19,12 +19,12 @@ | |||
| 19 | #include <asm/io_generic.h> | 19 | #include <asm/io_generic.h> |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | #define SETBITS_OUTB(mask, reg) ctrl_outb(ctrl_inb(reg) | mask, reg) | 22 | #define SETBITS_OUTB(mask, reg) __raw_writeb(__raw_readb(reg) | mask, reg) |
| 23 | #define SETBITS_OUTW(mask, reg) ctrl_outw(ctrl_inw(reg) | mask, reg) | 23 | #define SETBITS_OUTW(mask, reg) __raw_writew(__raw_readw(reg) | mask, reg) |
| 24 | #define SETBITS_OUTL(mask, reg) ctrl_outl(ctrl_inl(reg) | mask, reg) | 24 | #define SETBITS_OUTL(mask, reg) __raw_writel(__raw_readl(reg) | mask, reg) |
| 25 | #define CLRBITS_OUTB(mask, reg) ctrl_outb(ctrl_inb(reg) & ~mask, reg) | 25 | #define CLRBITS_OUTB(mask, reg) __raw_writeb(__raw_readb(reg) & ~mask, reg) |
| 26 | #define CLRBITS_OUTW(mask, reg) ctrl_outw(ctrl_inw(reg) & ~mask, reg) | 26 | #define CLRBITS_OUTW(mask, reg) __raw_writew(__raw_readw(reg) & ~mask, reg) |
| 27 | #define CLRBITS_OUTL(mask, reg) ctrl_outl(ctrl_inl(reg) & ~mask, reg) | 27 | #define CLRBITS_OUTL(mask, reg) __raw_writel(__raw_readl(reg) & ~mask, reg) |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | #define PA_LED PORT_PADR /* LED */ | 30 | #define PA_LED PORT_PADR /* LED */ |