diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/sstfb.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/sstfb.c')
| -rw-r--r-- | drivers/video/sstfb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 609d0a521ca2..dee64c3b1e67 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
| @@ -86,7 +86,6 @@ | |||
| 86 | #include <linux/pci.h> | 86 | #include <linux/pci.h> |
| 87 | #include <linux/delay.h> | 87 | #include <linux/delay.h> |
| 88 | #include <linux/init.h> | 88 | #include <linux/init.h> |
| 89 | #include <linux/slab.h> | ||
| 90 | #include <asm/io.h> | 89 | #include <asm/io.h> |
| 91 | #include <linux/uaccess.h> | 90 | #include <linux/uaccess.h> |
| 92 | #include <video/sstfb.h> | 91 | #include <video/sstfb.h> |
| @@ -1102,7 +1101,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp) | |||
| 1102 | * detect dac type | 1101 | * detect dac type |
| 1103 | * prerequisite : write to FbiInitx enabled, video and fbi and pci fifo reset, | 1102 | * prerequisite : write to FbiInitx enabled, video and fbi and pci fifo reset, |
| 1104 | * dram refresh disabled, FbiInit remaped. | 1103 | * dram refresh disabled, FbiInit remaped. |
| 1105 | * TODO: mmh.. maybe i shoud put the "prerequisite" in the func ... | 1104 | * TODO: mmh.. maybe i should put the "prerequisite" in the func ... |
| 1106 | */ | 1105 | */ |
| 1107 | 1106 | ||
| 1108 | 1107 | ||