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 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ux500
/
board-u5500.c
diff --git
a/arch/arm/mach-ux500/board-u5500.c
b/arch/arm/mach-ux500/board-u5500.c
index fe1569b67c9182cea704dab1fc4ddd1145388dbe..9de9e9c4dbbbcf2322e0fbaf3140537e31b89d4a 100644
(file)
--- a/
arch/arm/mach-ux500/board-u5500.c
+++ b/
arch/arm/mach-ux500/board-u5500.c
@@
-10,7
+10,7
@@
#include <linux/amba/bus.h>
#include <linux/irq.h>
#include <linux/i2c.h>
-#include <linux/mfd/ab
5
500/ab5500.h>
+#include <linux/mfd/ab
x
500/ab5500.h>
#include <asm/hardware/gic.h>
#include <asm/mach/arch.h>