Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jco…

…oper/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
git-mirror · Sep 2, 2012 · 3800bd3 · 3800bd3
2 parents aa9f6d6 + 4fd2057
commit 3800bd3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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>