summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-04-14 12:11:42 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-16 21:42:59 +0100
commite9569c1511d2590a27b46b94bafb7acece034e5c (patch)
treeaf9f5c882f676515bf9a7440d3543894a7299085 /arch/arm/include/asm
parent0d58a2824d777923b2438107053c6e073c9c5ec1 (diff)
downloadblackbird-op-linux-e9569c1511d2590a27b46b94bafb7acece034e5c.tar.gz
blackbird-op-linux-e9569c1511d2590a27b46b94bafb7acece034e5c.zip
ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h
Issue manifests as: In file included from arch/arm/mach-pxa/include/mach/hardware.h:62, from arch/arm/mach-pxa/include/mach/gpio.h:28, from /home/jic23/src/kernel/temp-remove/arch/arm/include/asm/gpio.h:5, from include/linux/gpio.h:7, from drivers/staging/iio/gyro/adis16080_core.c:8: /home/jic23/src/kernel/temp-remove/arch/arm/include/asm/cputype.h:57: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'read_cpuid_id' ... Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/cputype.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index ed5bc9e05a4e..cd4458f64171 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -2,6 +2,7 @@
#define __ASM_ARM_CPUTYPE_H
#include <linux/stringify.h>
+#include <linux/kernel.h>
#define CPUID_ID 0
#define CPUID_CACHETYPE 1
OpenPOWER on IntegriCloud