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/s1d13xxxfb.c | |
parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) |
Merge Paulus' tree
Diffstat (limited to 'drivers/video/s1d13xxxfb.c')
-rw-r--r-- | drivers/video/s1d13xxxfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index cb2f7a1de947..f4437430dc5f 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include <linux/config.h> | 31 | #include <linux/config.h> |
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/device.h> | 33 | #include <linux/platform_device.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | 35 | ||
36 | #include <linux/types.h> | 36 | #include <linux/types.h> |