diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 13:53:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 13:53:40 -0700 |
| commit | 6faee84b006af55bab9908741dd76916c8450be2 (patch) | |
| tree | 48b9b108625818183f8838ffd8b5b0eb1813f83d | |
| parent | 2ba302c633754520c990a8c1d161ff304eda6002 (diff) | |
| parent | b863f46e6a523276b77dd128ec268f8c509b4554 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Trivial fix for hp6xx build.
sh: Fixup __cmpxchg() compile breakage with gcc4.
sh: Kill bogus GCC4 symbol exports.
| -rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 3 | ||||
| -rw-r--r-- | include/asm-sh/hp6xx.h | 6 | ||||
| -rw-r--r-- | include/asm-sh/system.h | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index fe1b276c97c..6e0d10fac4a 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c @@ -82,9 +82,6 @@ DECLARE_EXPORT(__movstr); DECLARE_EXPORT(__movmem_i4_even); DECLARE_EXPORT(__movmem_i4_odd); DECLARE_EXPORT(__movmemSI12_i4); -DECLARE_EXPORT(__sdivsi3_i4i); -DECLARE_EXPORT(__udiv_qrnnd_16); -DECLARE_EXPORT(__udivsi3_i4i); #else /* GCC 3.x */ DECLARE_EXPORT(__movstr_i4_even); DECLARE_EXPORT(__movstr_i4_odd); diff --git a/include/asm-sh/hp6xx.h b/include/asm-sh/hp6xx.h index f35134c159d..53ca5643d9c 100644 --- a/include/asm-sh/hp6xx.h +++ b/include/asm-sh/hp6xx.h @@ -10,9 +10,9 @@ * */ -#define HP680_BTN_IRQ IRQ0_IRQ -#define HP680_TS_IRQ IRQ3_IRQ -#define HP680_HD64461_IRQ IRQ4_IRQ +#define HP680_BTN_IRQ 32 /* IRQ0_IRQ */ +#define HP680_TS_IRQ 35 /* IRQ3_IRQ */ +#define HP680_HD64461_IRQ 36 /* IRQ4_IRQ */ #define DAC_LCD_BRIGHTNESS 0 #define DAC_SPEAKER_VOLUME 1 diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h index b1e42e7f998..4a6a19f4f8a 100644 --- a/include/asm-sh/system.h +++ b/include/asm-sh/system.h @@ -7,6 +7,7 @@ */ #include <linux/irqflags.h> +#include <linux/compiler.h> #include <asm/types.h> /* |