diff options
| author | Florian Tobias Schandinat | 2011-11-22 00:42:06 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat | 2011-11-22 00:42:06 +0100 |
| commit | 300e812db26f4aa022e346f5fb9af1af134d98d8 (patch) | |
| tree | 382b45253a704087e8aa0c770bf3fc2ad67d4b02 /drivers/video/atmel_lcdfb.c | |
| parent | video: s3c-fb: fix transparency length for pixel blending (diff) | |
| parent | Linux 3.2-rc2 (diff) | |
| download | kernel-qcow2-linux-300e812db26f4aa022e346f5fb9af1af134d98d8.tar.gz kernel-qcow2-linux-300e812db26f4aa022e346f5fb9af1af134d98d8.tar.xz kernel-qcow2-linux-300e812db26f4aa022e346f5fb9af1af134d98d8.zip | |
Merge commit 'v3.2-rc2' into fbdev-next
Diffstat (limited to 'drivers/video/atmel_lcdfb.c')
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 2226aca44c57..ced4419e56e2 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -18,10 +18,11 @@ #include <linux/delay.h> #include <linux/backlight.h> #include <linux/gfp.h> +#include <linux/module.h> #include <mach/board.h> #include <mach/cpu.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <video/atmel_lcdc.h> |