aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-02 08:21:25 -0700
committerOlof Johansson <olof@lixom.net>2012-09-02 08:21:25 -0700
commit3800bd392ffc70cb699fbd06734ae9aabea97979 (patch)
treeff5350bb191d24d1247d32d5e8c955fa060672ad /arch
parentaa9f6d6b1be17fb84cd62e19f8d997b378b1c852 (diff)
parent4fd20570995c46b08711b062c69ab903319d6041 (diff)
downloadlinux-linaro-stable-3800bd392ffc70cb699fbd06734ae9aabea97979.tar.gz
Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into fixes
* 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-kirkwood/db88f6281-bp-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index d93359379598..be90b7d0e10b 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/sizes.h>
#include <linux/platform_device.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>