summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm2835
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-01-09 17:38:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-09 17:38:26 +0100
commitff6383c8e4bde31036fbd31f7961539be288d6af (patch)
tree26f187f697be5f434f533d6b304bddd311cc81fd /arch/arm/mach-bcm2835
parent2af31fbc239ae40a59f926bc5e505956a1bf27ef (diff)
parent11f588be314af70e1b058aac06663f29606846cd (diff)
downloadbarebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.gz
barebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/mach-bcm2835')
-rw-r--r--arch/arm/mach-bcm2835/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm2835/core.c b/arch/arm/mach-bcm2835/core.c
index 04bc89751d..7f3d7e7629 100644
--- a/arch/arm/mach-bcm2835/core.c
+++ b/arch/arm/mach-bcm2835/core.c
@@ -25,7 +25,7 @@
#include <io.h>
#include <asm/armlinux.h>
-#include <sizes.h>
+#include <linux/sizes.h>
#include <mach/platform.h>
#include <mach/wd.h>