summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 13:53:40 -0700
commit6faee84b006af55bab9908741dd76916c8450be2 (patch)
tree48b9b108625818183f8838ffd8b5b0eb1813f83d /include
parent2ba302c633754520c990a8c1d161ff304eda6002 (diff)
parentb863f46e6a523276b77dd128ec268f8c509b4554 (diff)
downloadop-kernel-dev-6faee84b006af55bab9908741dd76916c8450be2.zip
op-kernel-dev-6faee84b006af55bab9908741dd76916c8450be2.tar.gz
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.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/hp6xx.h6
-rw-r--r--include/asm-sh/system.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-sh/hp6xx.h b/include/asm-sh/hp6xx.h
index f35134c..53ca564 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 b1e42e7..4a6a19f 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>
/*
OpenPOWER on IntegriCloud