projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
arm
/
mach-sa1100
/
assabet.c
diff --git
a/arch/arm/mach-sa1100/assabet.c
b/arch/arm/mach-sa1100/assabet.c
index
7dd894e
..
d28ecb9
100644
(file)
--- a/
arch/arm/mach-sa1100/assabet.c
+++ b/
arch/arm/mach-sa1100/assabet.c
@@
-37,7
+37,7
@@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-#include <
asm/mach/irda
.h>
+#include <
linux/platform_data/irda-sa11x0
.h>
#include <asm/mach/map.h>
#include <mach/assabet.h>
#include <linux/platform_data/mfd-mcp-sa11x0.h>