summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/beaglebone
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/boards/beaglebone
parent2af31fbc239ae40a59f926bc5e505956a1bf27ef (diff)
parent11f588be314af70e1b058aac06663f29606846cd (diff)
downloadbarebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.gz
barebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/boards/beaglebone')
-rw-r--r--arch/arm/boards/beaglebone/board.c2
-rw-r--r--arch/arm/boards/beaglebone/lowlevel.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index 9b1a9ecdc2..4e0e3745bb 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -27,7 +27,7 @@
#include <envfs.h>
#include <environment.h>
#include <globalvar.h>
-#include <sizes.h>
+#include <linux/sizes.h>
#include <net.h>
#include <envfs.h>
#include <bootsource.h>
diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c
index a742bbf7af..05b3e5f157 100644
--- a/arch/arm/boards/beaglebone/lowlevel.c
+++ b/arch/arm/boards/beaglebone/lowlevel.c
@@ -1,5 +1,5 @@
#include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
#include <io.h>
#include <linux/string.h>
#include <debug_ll.h>