Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[deliverable/linux.git] / drivers / video / atmel_lcdfb.c

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 244d55b7c0ae38dea57d53cd3a1a5b34607dcdf4..4ac48d9ee66584a797393fd5e836ee82a5024957 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -21,7 +21,7 @@
 
 #include <mach/board.h>
 #include <mach/cpu.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #include <video/atmel_lcdc.h>