Commit 6faee84b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 2ba302c6 b863f46e

arch/sh/kernel/sh_ksyms.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

include/asm-sh/hp6xx.h

+3 −3
Original line number Diff line number Diff line
@@ -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

include/asm-sh/system.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/irqflags.h>

#include <linux/compiler.h>

#include <asm/types.h>



/*