diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
| commit | 00c04db982b66fe9e8c8c5156808b905199bd645 (patch) | |
| tree | d394c01dceffe37a6f67cccfc2e87a64aad7740a /include | |
| parent | 6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34 (diff) | |
| parent | 2a1bf8b7da2736d85d683fb921ac9a6b71719f37 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4872/1: Replaces buggy macro in S3C2410 irq include
[ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT
[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp
[ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code
[ARM] 4864/1: Enable write buffer coalescing on IOP
[ARM] 4863/1: AT91: CAP9 USART definitions for early debug
[ARM] 4861/1: AT91: Update maintainer email address (again)
ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt
ARM: OMAP: Fix chain_a_transfer return value
ARM: OMAP: Fix missing makefile options
ARM: OMAP: Fix GPIO IRQ unmask
ARM: OMAP: Fix clockevent support for hrtimers
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-at91/at91cap9.h | 7 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap/dsp_common.h | 8 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c2410/irqs.h | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/include/asm-arm/arch-at91/at91cap9.h b/include/asm-arm/arch-at91/at91cap9.h index 73e1fcf4a0a..bac83adb505 100644 --- a/include/asm-arm/arch-at91/at91cap9.h +++ b/include/asm-arm/arch-at91/at91cap9.h @@ -97,12 +97,17 @@ #define AT91_PIOD (0xfffff800 - AT91_BASE_SYS) #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) -#define AT91_SHDC (0xfffffd10 - AT91_BASE_SYS) +#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) #define AT91_RTT (0xfffffd20 - AT91_BASE_SYS) #define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) #define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) +#define AT91_USART0 AT91CAP9_BASE_US0 +#define AT91_USART1 AT91CAP9_BASE_US1 +#define AT91_USART2 AT91CAP9_BASE_US2 + + /* * Internal Memory. */ diff --git a/include/asm-arm/arch-omap/dsp_common.h b/include/asm-arm/arch-omap/dsp_common.h index c61f868f24e..da97736f3ef 100644 --- a/include/asm-arm/arch-omap/dsp_common.h +++ b/include/asm-arm/arch-omap/dsp_common.h @@ -24,11 +24,17 @@ #ifndef ASM_ARCH_DSP_COMMON_H #define ASM_ARCH_DSP_COMMON_H -#ifdef CONFIG_ARCH_OMAP1 +#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK) extern void omap_dsp_request_mpui(void); extern void omap_dsp_release_mpui(void); extern int omap_dsp_request_mem(void); extern int omap_dsp_release_mem(void); +#else +static inline int omap_dsp_request_mem(void) +{ + return 0; +} +#define omap_dsp_release_mem() do {} while (0) #endif #endif /* ASM_ARCH_DSP_COMMON_H */ diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h index d858b3eb554..f5435d8c376 100644 --- a/include/asm-arm/arch-s3c2410/irqs.h +++ b/include/asm-arm/arch-s3c2410/irqs.h @@ -85,7 +85,7 @@ #define IRQ_EINT23 S3C2410_IRQ(51) -#define IRQ_EINT(x) S3C2410_IRQ((x >= 4) ? (IRQ_EINT4 + (x) - 4) : (S3C2410_IRQ(0) + (x))) +#define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x))) #define IRQ_LCD_FIFO S3C2410_IRQ(52) #define IRQ_LCD_FRAME S3C2410_IRQ(53) |