diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/video/valkyriefb.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/video/valkyriefb.c')
| -rw-r--r-- | drivers/video/valkyriefb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 06fc19a61192..ad66f070acb8 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | #include <linux/fb.h> | 51 | #include <linux/fb.h> |
| 52 | #include <linux/selection.h> | 52 | #include <linux/selection.h> |
| 53 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 54 | #include <linux/pci.h> | ||
| 55 | #include <linux/nvram.h> | 54 | #include <linux/nvram.h> |
| 56 | #include <linux/adb.h> | 55 | #include <linux/adb.h> |
| 57 | #include <linux/cuda.h> | 56 | #include <linux/cuda.h> |