From: Andrew Morton <akpm@linux-foundation.org>

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexander Bigga <ab@mycable.de>
Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: David Brownell <david-b@pacbell.net>
Cc: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/rtc/rtc-m41t80.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/rtc/Kconfig~rtc-add-rtc-m41t80-driver-take-2-fix drivers/rtc/Kconfig
diff -puN drivers/rtc/Makefile~rtc-add-rtc-m41t80-driver-take-2-fix drivers/rtc/Makefile
diff -puN drivers/rtc/rtc-m41t80.c~rtc-add-rtc-m41t80-driver-take-2-fix drivers/rtc/rtc-m41t80.c
--- a/drivers/rtc/rtc-m41t80.c~rtc-add-rtc-m41t80-driver-take-2-fix
+++ a/drivers/rtc/rtc-m41t80.c
@@ -492,7 +492,7 @@ static int m41t80_probe(struct i2c_clien
 	int i, rc = 0;
 	struct rtc_device *rtc = NULL;
 	struct rtc_time tm;
-	const static struct m41t80_chip_info *chip;
+	const struct m41t80_chip_info *chip;
 	struct m41t80_data *clientdata = NULL;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C
_