From aa6f5ffbdba45aa8e19e5048648fc6c7b25376d3 Mon Sep 17 00:00:00 2001 From: merge Date: Thu, 22 Jan 2009 13:55:32 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040-1232632141 / fdf777a63bcb59e0dfd78bfe2c6242e01f6d4eb9 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040 stable-tracking-hist top was MERGE-via-mokopatches-tracking-fix-stray-endmenu-patch-1232632040 / 90463bfd2d5a3c8b52f6e6d71024a00e052b0ced ... parent commitmessage: From: merge MERGE-via-mokopatches-tracking-hist-fix-stray-endmenu-patch mokopatches-tracking-hist top was fix-stray-endmenu-patch / 3630e0be570de8057e7f8d2fe501ed353cdf34e6 ... parent commitmessage: From: Andy Green fix-stray-endmenu.patch Signed-off-by: Andy Green --- include/linux/mfd/pcf50606/rtc.h | 43 ---------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 include/linux/mfd/pcf50606/rtc.h (limited to 'include/linux/mfd/pcf50606/rtc.h') diff --git a/include/linux/mfd/pcf50606/rtc.h b/include/linux/mfd/pcf50606/rtc.h deleted file mode 100644 index d025710ca0f..00000000000 --- a/include/linux/mfd/pcf50606/rtc.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * rtc.h -- RTC driver for NXP PCF50606 - * - * (C) 2006-2008 by Openmoko, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#ifndef __LINUX_MFD_PCF50606_RTC_H -#define __LINUX_MFD_PCF50606_RTC_H - -#include -#include - -#define PCF50606_REG_RTCSC 0x0a /* Second */ -#define PCF50606_REG_RTCMN 0x0b /* Minute */ -#define PCF50606_REG_RTCHR 0x0c /* Hour */ -#define PCF50606_REG_RTCWD 0x0d /* Weekday */ -#define PCF50606_REG_RTCDT 0x0e /* Day */ -#define PCF50606_REG_RTCMT 0x0f /* Month */ -#define PCF50606_REG_RTCYR 0x10 /* Year */ -#define PCF50606_REG_RTCSCA 0x11 /* Alarm Second */ -#define PCF50606_REG_RTCMNA 0x12 /* Alarm Minute */ -#define PCF50606_REG_RTCHRA 0x13 /* Alarm Hour */ -#define PCF50606_REG_RTCWDA 0x14 /* Alarm Weekday */ -#define PCF50606_REG_RTCDTA 0x15 /* Alarm Day */ -#define PCF50606_REG_RTCMTA 0x16 /* Alarm Month */ -#define PCF50606_REG_RTCYRA 0x17 /* Alarm Year */ - -struct pcf50606_rtc { - int alarm_enabled; - int second_enabled; - - struct rtc_device *rtc_dev; - struct platform_device *pdev; -}; - -#endif - -- cgit v1.2.3