Commit d37654d3 authored by David Brownell's avatar David Brownell Committed by Tony Lindgren

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
parent 5d8da87b
...@@ -130,16 +130,6 @@ config GPIOEXPANDER_OMAP ...@@ -130,16 +130,6 @@ config GPIOEXPANDER_OMAP
If you say yes here you get support for I/O expander calls If you say yes here you get support for I/O expander calls
to configure IrDA, Camera and audio devices. 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 config TWL4030_CORE
bool "TI's TWL4030 companion chip Core Driver Support" bool "TI's TWL4030 companion chip Core Driver Support"
depends on I2C=y && ARCH_OMAP24XX depends on I2C=y && ARCH_OMAP24XX
......
...@@ -930,7 +930,7 @@ static int menelaus_set_time(struct device *dev, struct rtc_time *t) ...@@ -930,7 +930,7 @@ static int menelaus_set_time(struct device *dev, struct rtc_time *t)
return status; return status;
status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday)); status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday));
if (status < 0) { 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); "err %d\n", MENELAUS_RTC_WKDAY, status);
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment