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 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
leds-simpad.c
diff --git
a/arch/arm/mach-sa1100/leds-simpad.c
b/arch/arm/mach-sa1100/leds-simpad.c
index def090a87385c7915ea5ecd83658d5fd70d53f00..d50f4eeaa12ee5045282eca6d2b96cc18b59fa42 100644
(file)
--- a/
arch/arm/mach-sa1100/leds-simpad.c
+++ b/
arch/arm/mach-sa1100/leds-simpad.c
@@
-5,10
+5,10
@@
*/
#include <linux/init.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/leds.h>
#include <asm/system.h>
-#include <
asm/ar
ch/simpad.h>
+#include <
ma
ch/simpad.h>
#include "leds.h"