diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 19:10:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 19:10:40 -0400 |
| commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
| tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/arm/plat-omap/include/mach/pm.h | |
| parent | be093beb608edf821b45fe00a8a080fb5c6ed4af (diff) | |
| parent | 569106c70e49ad67c69fa7d43a2a5218e63a4619 (diff) | |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
Diffstat (limited to 'arch/arm/plat-omap/include/mach/pm.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/pm.h | 2 |
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 ca81830b4f86..ce6ee7927537 100644 --- a/arch/arm/plat-omap/include/mach/pm.h +++ b/arch/arm/plat-omap/include/mach/pm.h | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | !defined(CONFIG_ARCH_OMAP15XX) && \ | 108 | !defined(CONFIG_ARCH_OMAP15XX) && \ |
| 109 | !defined(CONFIG_ARCH_OMAP16XX) && \ | 109 | !defined(CONFIG_ARCH_OMAP16XX) && \ |
| 110 | !defined(CONFIG_ARCH_OMAP24XX) | 110 | !defined(CONFIG_ARCH_OMAP24XX) |
| 111 | #error "Power management for this processor not implemented yet" | 111 | #warning "Power management for this processor not implemented yet" |
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #ifndef __ASSEMBLER__ | 114 | #ifndef __ASSEMBLER__ |