summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/armlinux.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-03 09:20:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-03 09:20:29 +0200
commit628434ae500f951fa4347d41012195ec88d1b394 (patch)
tree3f742af7c56ad6e92039f003adf4ea4a6b68dec9 /arch/arm/lib/armlinux.c
parentf9f35ee93821048bbace895c5c688bafbda2c3f3 (diff)
parent147affbd8d5bc4a45be9ea8d9532334c77412853 (diff)
downloadbarebox-628434ae500f951fa4347d41012195ec88d1b394.tar.gz
barebox-628434ae500f951fa4347d41012195ec88d1b394.tar.xz
Merge branch 'pu-remove-gd_t' into next
Diffstat (limited to 'arch/arm/lib/armlinux.c')
-rw-r--r--arch/arm/lib/armlinux.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index c8ed402a8a..5bdbb92bff 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -37,7 +37,6 @@
#include <errno.h>
#include <asm/byteorder.h>
-#include <asm/global_data.h>
#include <asm/setup.h>
#include <asm/barebox-arm.h>
#include <asm/armlinux.h>