diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/video/hitfb.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/hitfb.c')
| -rw-r--r-- | drivers/video/hitfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ | |||
| 29 | #include <asm/io.h> | 29 | #include <asm/io.h> |
| 30 | #include <asm/hd64461.h> | 30 | #include <asm/hd64461.h> |
| 31 | #include <asm/cpu/dac.h> | 31 | #include <asm/cpu/dac.h> |
| 32 | #include <asm/hp6xx/hp6xx.h> | ||
| 33 | 32 | ||
| 34 | #define WIDTH 640 | 33 | #define WIDTH 640 |
| 35 | 34 | ||