diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-11 10:18:22 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-11 10:18:22 -0400 |
| commit | 86822f816fc9a42fd210e35d4881e988406497c0 (patch) | |
| tree | 3bed5cb7891ef73eea4c58bdf105b98f4ff77a4a /drivers/video | |
| parent | d211093fbad99e6c38e168f71ca2ede64a51fe58 (diff) | |
| parent | 304b2c684e42af5b72d643322f783d88538dc817 (diff) | |
Merge branch 'clps711x/cleanup' into next/cleanup
A single patch from Alexander Shiyan <shc_work@mail.ru>:
* clps711x/cleanup:
ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/clps711xfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c index 99b354b8e257..f994c8b8f10a 100644 --- a/drivers/video/clps711xfb.c +++ b/drivers/video/clps711xfb.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 34 | #include <linux/uaccess.h> | 34 | #include <linux/uaccess.h> |
| 35 | 35 | ||
| 36 | #include <asm/hardware/clps7111.h> | ||
| 37 | #include <mach/syspld.h> | 36 | #include <mach/syspld.h> |
| 38 | 37 | ||
| 39 | struct fb_info *cfb; | 38 | struct fb_info *cfb; |