diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/video/intelfb/intelfbdrv.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 3f39d84015f1..06af89d44a0d 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
| @@ -113,7 +113,6 @@ | |||
| 113 | #include <linux/errno.h> | 113 | #include <linux/errno.h> |
| 114 | #include <linux/string.h> | 114 | #include <linux/string.h> |
| 115 | #include <linux/mm.h> | 115 | #include <linux/mm.h> |
| 116 | #include <linux/tty.h> | ||
| 117 | #include <linux/slab.h> | 116 | #include <linux/slab.h> |
| 118 | #include <linux/delay.h> | 117 | #include <linux/delay.h> |
| 119 | #include <linux/fb.h> | 118 | #include <linux/fb.h> |
| @@ -122,6 +121,7 @@ | |||
| 122 | #include <linux/pci.h> | 121 | #include <linux/pci.h> |
| 123 | #include <linux/vmalloc.h> | 122 | #include <linux/vmalloc.h> |
| 124 | #include <linux/pagemap.h> | 123 | #include <linux/pagemap.h> |
| 124 | #include <linux/screen_info.h> | ||
| 125 | 125 | ||
| 126 | #include <asm/io.h> | 126 | #include <asm/io.h> |
| 127 | 127 | ||