diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 16:50:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 16:50:00 +0200 |
| commit | 2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (patch) | |
| tree | 62a49268a6baa58b25c76e5deae21f9b49bcc626 /drivers | |
| parent | Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 (diff) | |
| parent | sh: Convert INTC2 to IRQ table registration. (diff) | |
| download | linux-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.tar.xz linux-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.zip | |
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.c | 2 | ||||
| -rw-r--r-- | drivers/video/hitfb.c | 1 |
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 e31c6c55b2e2..58fca316786c 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 3afb472763c0..3dc49424dc75 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 |