diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
| commit | 3995f4c5327595b51482bdac8c189736262eb6e0 (patch) | |
| tree | ef768d0ecf243a2376bfc646b847964313146d3e /drivers/video/cyber2000fb.c | |
| parent | 05814450070f13b671fc9dbf89477677aa0258cb (diff) | |
| parent | fe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/video/cyber2000fb.c')
| -rw-r--r-- | drivers/video/cyber2000fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index a9300f930ef2..55a3514157ed 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 51 | 51 | ||
| 52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 53 | #include <asm/irq.h> | ||
| 54 | #include <asm/pgtable.h> | 53 | #include <asm/pgtable.h> |
| 55 | #include <asm/system.h> | 54 | #include <asm/system.h> |
| 56 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |