git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
imxfb.c
diff --git
a/drivers/video/imxfb.c
b/drivers/video/imxfb.c
index 0c5a475c1caecfe4545218b985932bfb35997e4b..ccd986140c95ca71c56778a26819e4985eb89da1 100644
(file)
--- a/
drivers/video/imxfb.c
+++ b/
drivers/video/imxfb.c
@@
-33,9
+33,9
@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
-#include <
asm/ar
ch/imxfb.h>
+#include <
ma
ch/imxfb.h>
/*
* Complain if VAR is out of range.