aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/memory.h
diff options
context:
space:
mode:
authorAlessandro Rubini <rubini@gnudd.com>2012-06-24 12:46:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-06-28 17:14:35 +0100
commit158e8bfe802f730f9ea7cde32eee8b43285bdd4a (patch)
tree17e3c1a38e506494a5797f90e3d7a6a7b7f3d91c /arch/arm/include/asm/memory.h
parentARM: 7431/1: amba: use the new linux/sizes.h (diff)
downloadlinux-dev-158e8bfe802f730f9ea7cde32eee8b43285bdd4a.tar.xz
linux-dev-158e8bfe802f730f9ea7cde32eee8b43285bdd4a.zip
ARM: 7432/1: use the new linux/sizes.h
Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/memory.h')
-rw-r--r--arch/arm/include/asm/memory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index fcb575747e5e..e965f1b560f1 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -16,7 +16,7 @@
#include <linux/compiler.h>
#include <linux/const.h>
#include <linux/types.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
#ifdef CONFIG_NEED_MACH_MEMORY_H
#include <mach/memory.h>