diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
tree | a72913a29495ca078987c09fc0008f47e11b900b /include/asm-arm/arch-omap/entry-macro.S | |
parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'include/asm-arm/arch-omap/entry-macro.S')
-rw-r--r-- | include/asm-arm/arch-omap/entry-macro.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S index 0d29b9c56a9..f8814a84910 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/include/asm-arm/arch-omap/entry-macro.S @@ -10,6 +10,20 @@ #if defined(CONFIG_ARCH_OMAP1) +#if defined(CONFIG_ARCH_OMAP730) && \ + (defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)) +#error "FIXME: OMAP730 doesn't support multiple-OMAP" +#elif defined(CONFIG_ARCH_OMAP730) +#define INT_IH2_IRQ INT_730_IH2_IRQ +#elif defined(CONFIG_ARCH_OMAP15XX) +#define INT_IH2_IRQ INT_1510_IH2_IRQ +#elif defined(CONFIG_ARCH_OMAP16XX) +#define INT_IH2_IRQ INT_1610_IH2_IRQ +#else +#warning "IH2 IRQ defaulted" +#define INT_IH2_IRQ INT_1510_IH2_IRQ +#endif + .macro disable_fiq .endm |