diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /drivers/video/sa1100fb.c | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'drivers/video/sa1100fb.c')
| -rw-r--r-- | drivers/video/sa1100fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 78e5f194b0df..3d35b28aaac7 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
| @@ -173,7 +173,7 @@ | |||
| 173 | #include <linux/init.h> | 173 | #include <linux/init.h> |
| 174 | #include <linux/ioport.h> | 174 | #include <linux/ioport.h> |
| 175 | #include <linux/cpufreq.h> | 175 | #include <linux/cpufreq.h> |
| 176 | #include <linux/device.h> | 176 | #include <linux/platform_device.h> |
| 177 | #include <linux/dma-mapping.h> | 177 | #include <linux/dma-mapping.h> |
| 178 | 178 | ||
| 179 | #include <asm/hardware.h> | 179 | #include <asm/hardware.h> |