From bbe976ce41fbe5fd0e402b71349271c1fe599043 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 14 Jan 2008 17:22:31 -0800 Subject: [PATCH] ARM: OMAP: Misc fixes based on RMK's comments Misc fixes based on RMK's comments for the omap-upstream series. Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/dmtimer.c | 2 +- include/asm-arm/arch-omap/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 36bcdbf2b9f..e719d0eeb5c 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -221,7 +221,7 @@ static void omap_dm_timer_reset(struct omap_dm_timer *timer) l = omap_dm_timer_read_reg(timer, OMAP_TIMER_OCP_CFG_REG); l |= 0x02 << 3; - if (cpu_class_is_omap2() && (timer == &dm_timers[0])) { + if (cpu_class_is_omap2() && timer == &dm_timers[0]) { /* Enable wake-up only for GPT1 on OMAP2 CPUs*/ l |= 1 << 2; /* Non-posted mode */ diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h index 0255d822d7c..688fcd790c0 100644 --- a/include/asm-arm/arch-omap/common.h +++ b/include/asm-arm/arch-omap/common.h @@ -41,7 +41,7 @@ extern int omap_register_i2c_bus(int bus_id, u32 clkrate, struct i2c_board_info const *info, unsigned len); #else -#define omap_register_i2c_bus(...) do { } while (0) +#define omap_register_i2c_bus(a, b, c, d) 0 #endif void omap2_set_globals_242x(void); -- 2.41.1