From d37654d323cc9b2b79ec948f9352ed0b629aa56a Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 15 Aug 2007 03:50:54 -0700 Subject: [PATCH] menelaus minor cleanups Remove duplicate Menelaus Kconfig entry (omap tree only). Fix Menelaus build error, and remove needless "#define DEBUG" (goes upstream). Signed-off-by: David Brownell --- drivers/i2c/chips/Kconfig | 10 ---------- drivers/i2c/chips/menelaus.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index fd580172a9b..f6b492bcbc2 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -130,16 +130,6 @@ config GPIOEXPANDER_OMAP If you say yes here you get support for I/O expander calls to configure IrDA, Camera and audio devices. -config MENELAUS - bool "TWL92330/Menelaus PM chip" - depends on I2C=y && ARCH_OMAP24XX - help - If you say yes here you get support for the Texas Instruments - TWL92330/Menelaus Power Management chip. This include voltage - regulators, Dual slot memory card tranceivers, real-time clock - and other features that are often used in portable devices like - cell phones and PDAs. - config TWL4030_CORE bool "TI's TWL4030 companion chip Core Driver Support" depends on I2C=y && ARCH_OMAP24XX diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index 1c4d8ab0b14..624413b0881 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c @@ -930,7 +930,7 @@ static int menelaus_set_time(struct device *dev, struct rtc_time *t) return status; status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday)); if (status < 0) { - dev_err(&the_menelaus->client->dev, "rtc write reg %02x", + dev_err(&the_menelaus->client->dev, "rtc write reg %02x" "err %d\n", MENELAUS_RTC_WKDAY, status); return status; } -- 2.41.1