tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds 6faee84b 2ba302c6

+4 -6
-3
arch/sh/kernel/sh_ksyms.c
··· 82 82 DECLARE_EXPORT(__movmem_i4_even); 83 83 DECLARE_EXPORT(__movmem_i4_odd); 84 84 DECLARE_EXPORT(__movmemSI12_i4); 85 - DECLARE_EXPORT(__sdivsi3_i4i); 86 - DECLARE_EXPORT(__udiv_qrnnd_16); 87 - DECLARE_EXPORT(__udivsi3_i4i); 88 85 #else /* GCC 3.x */ 89 86 DECLARE_EXPORT(__movstr_i4_even); 90 87 DECLARE_EXPORT(__movstr_i4_odd);
+3 -3
include/asm-sh/hp6xx.h
··· 10 10 * 11 11 */ 12 12 13 - #define HP680_BTN_IRQ IRQ0_IRQ 14 - #define HP680_TS_IRQ IRQ3_IRQ 15 - #define HP680_HD64461_IRQ IRQ4_IRQ 13 + #define HP680_BTN_IRQ 32 /* IRQ0_IRQ */ 14 + #define HP680_TS_IRQ 35 /* IRQ3_IRQ */ 15 + #define HP680_HD64461_IRQ 36 /* IRQ4_IRQ */ 16 16 17 17 #define DAC_LCD_BRIGHTNESS 0 18 18 #define DAC_SPEAKER_VOLUME 1
+1
include/asm-sh/system.h
··· 7 7 */ 8 8 9 9 #include <linux/irqflags.h> 10 + #include <linux/compiler.h> 10 11 #include <asm/types.h> 11 12 12 13 /*