aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/pm.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 23:24:12 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 23:24:12 +0100
commitd00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch)
treeb8d8f98c1af633bbc1570b4270b39727737beebf /arch/arm/plat-omap/include/mach/pm.h
parentfutex: remove the pointer math from double_unlock_hb, fix (diff)
parentMerge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
downloadlinux-dev-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.xz
linux-dev-d00ab2fdd4dc4361c97777bc1fef7234329d4659.zip
Merge branch 'linus' into core/futexes
Diffstat (limited to 'arch/arm/plat-omap/include/mach/pm.h')
-rw-r--r--arch/arm/plat-omap/include/mach/pm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h
index 2a9c27ad4c37..37e2f0f38b46 100644
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@ -108,7 +108,7 @@
!defined(CONFIG_ARCH_OMAP15XX) && \
!defined(CONFIG_ARCH_OMAP16XX) && \
!defined(CONFIG_ARCH_OMAP24XX)
-#error "Power management for this processor not implemented yet"
+#warning "Power management for this processor not implemented yet"
#endif
#ifndef __ASSEMBLER__