summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 07:50:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 07:50:00 -0700
commit2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (patch)
tree62a49268a6baa58b25c76e5deae21f9b49bcc626 /drivers
parent5cfc35cf79d46af998346e3d5cc66fa344d1af0e (diff)
parent66a740572d7bcb18469e71cb014bfed3ff75a773 (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: Convert INTC2 to IRQ table registration. sh: Updates for irq-flow-type naming changes. sh: Add some missing board headers. sh: Fix exception_handling_table alignment. sh: Cleanup board header directories. sh: Remove board-specific ide.h headers. sh: Proper show_stack/show_trace() implementation.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/touchscreen/hp680_ts_input.c2
-rw-r--r--drivers/video/hitfb.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index e31c6c55b2e..58fca316786 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -6,7 +6,7 @@
#include <asm/io.h>
#include <asm/delay.h>
#include <asm/adc.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
#define MODNAME "hp680_ts_input"
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 3afb472763c..3dc49424dc7 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -29,7 +29,6 @@
#include <asm/io.h>
#include <asm/hd64461.h>
#include <asm/cpu/dac.h>
-#include <asm/hp6xx/hp6xx.h>
#define WIDTH 640