diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-11 15:20:53 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 15:20:53 -0800 |
| commit | 4d0226042c05588be47b06bc1dbe7a09c9c540a4 (patch) | |
| tree | db16053ad7010c141a054ab0c8b5c243c311962f /arch/arm/mach-omap2/serial.c | |
| parent | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (diff) | |
| parent | f265dc4c5d39f2bd369d97c87a7bd89061b159d4 (diff) | |
Merge branch 'pm-upstream/pm-off' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index a5aecffe03ff..72df1b188135 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -155,8 +155,6 @@ static inline void __init omap_uart_reset(struct omap_uart_state *uart) #if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) -static int enable_off_mode; /* to be removed by full off-mode patches */ - static void omap_uart_save_context(struct omap_uart_state *uart) { u16 lcr = 0; |