projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
[platform/kernel/linux-exynos.git]
/
arch
/
arm
/
mach-sa1100
/
collie.c
diff --git
a/arch/arm/mach-sa1100/collie.c
b/arch/arm/mach-sa1100/collie.c
index
bd5155d
..
3cc2b71
100644
(file)
--- a/
arch/arm/mach-sa1100/collie.c
+++ b/
arch/arm/mach-sa1100/collie.c
@@
-43,7
+43,7
@@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
-#include <
asm/mach/irda
.h>
+#include <
linux/platform_data/irda-sa11x0
.h>
#include <asm/hardware/scoop.h>
#include <asm/mach/sharpsl_param.h>