diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/sh/include/mach-common/mach/magicpanelr2.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 c644a77ee357..183a2f744251 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 */ |