Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

CRIS v10: driver for ds1302 needs to include cris-specific i2c.h

This fixes compilation error where i2c_init wasn't defined.
Also, remove the CVS log and version tags, they are no longer useful.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jesper Nilsson and committed by
Linus Torvalds
bbde25b1 27b526a0

+3 -128
+3 -128
arch/cris/arch-v10/drivers/ds1302.c
··· 6 6 *! 7 7 *! Functions exported: ds1302_readreg, ds1302_writereg, ds1302_init 8 8 *! 9 - *! $Log: ds1302.c,v $ 10 - *! Revision 1.18 2005/01/24 09:11:26 mikaelam 11 - *! Minor changes to get DS1302 RTC chip driver to work 12 - *! 13 - *! Revision 1.17 2005/01/05 06:11:22 starvik 14 - *! No need to do local_irq_disable after local_irq_save. 15 - *! 16 - *! Revision 1.16 2004/12/13 12:21:52 starvik 17 - *! Added I/O and DMA allocators from Linux 2.4 18 - *! 19 - *! Revision 1.14 2004/08/24 06:48:43 starvik 20 - *! Whitespace cleanup 21 - *! 22 - *! Revision 1.13 2004/05/28 09:26:59 starvik 23 - *! Modified I2C initialization to work in 2.6. 24 - *! 25 - *! Revision 1.12 2004/05/14 07:58:03 starvik 26 - *! Merge of changes from 2.4 27 - *! 28 - *! Revision 1.10 2004/02/04 09:25:12 starvik 29 - *! Merge of Linux 2.6.2 30 - *! 31 - *! Revision 1.9 2003/07/04 08:27:37 starvik 32 - *! Merge of Linux 2.5.74 33 - *! 34 - *! Revision 1.8 2003/04/09 05:20:47 starvik 35 - *! Merge of Linux 2.5.67 36 - *! 37 - *! Revision 1.6 2003/01/09 14:42:51 starvik 38 - *! Merge of Linux 2.5.55 39 - *! 40 - *! Revision 1.4 2002/12/11 13:13:57 starvik 41 - *! Added arch/ to v10 specific includes 42 - *! Added fix from Linux 2.4 in serial.c (flush_to_flip_buffer) 43 - *! 44 - *! Revision 1.3 2002/11/20 11:56:10 starvik 45 - *! Merge of Linux 2.5.48 46 - *! 47 - *! Revision 1.2 2002/11/18 13:16:06 starvik 48 - *! Linux 2.5 port of latest 2.4 drivers 49 - *! 50 - *! Revision 1.15 2002/10/11 16:14:33 johana 51 - *! Added CONFIG_ETRAX_DS1302_TRICKLE_CHARGE and initial setting of the 52 - *! trcklecharge register. 53 - *! 54 - *! Revision 1.14 2002/10/10 12:15:38 magnusmn 55 - *! Added support for having the RST signal on bit g0 56 - *! 57 - *! Revision 1.13 2002/05/29 15:16:08 johana 58 - *! Removed unused variables. 59 - *! 60 - *! Revision 1.12 2002/04/10 15:35:25 johana 61 - *! Moved probe function closer to init function and marked it __init. 62 - *! 63 - *! Revision 1.11 2001/06/14 12:35:52 jonashg 64 - *! The ATA hack is back. It is unfortunately the only way to set g27 to output. 65 - *! 66 - *! Revision 1.9 2001/06/14 10:00:14 jonashg 67 - *! No need for tempudelay to be inline anymore (had to adjust the usec to 68 - *! loops conversion because of this to make it slow enough to be a udelay). 69 - *! 70 - *! Revision 1.8 2001/06/14 08:06:32 jonashg 71 - *! Made tempudelay delay usecs (well, just a tad more). 72 - *! 73 - *! Revision 1.7 2001/06/13 14:18:11 jonashg 74 - *! Only allow processes with SYS_TIME capability to set time and charge. 75 - *! 76 - *! Revision 1.6 2001/06/12 15:22:07 jonashg 77 - *! * Made init function __init. 78 - *! * Parameter to out_byte() is unsigned char. 79 - *! * The magic number 42 has got a name. 80 - *! * Removed comment about /proc (nothing is exported there). 81 - *! 82 - *! Revision 1.5 2001/06/12 14:35:13 jonashg 83 - *! Gave the module a name and added it to printk's. 84 - *! 85 - *! Revision 1.4 2001/05/31 14:53:40 jonashg 86 - *! Made tempudelay() inline so that the watchdog doesn't reset (see 87 - *! function comment). 88 - *! 89 - *! Revision 1.3 2001/03/26 16:03:06 bjornw 90 - *! Needs linux/config.h 91 - *! 92 - *! Revision 1.2 2001/03/20 19:42:00 bjornw 93 - *! Use the ETRAX prefix on the DS1302 options 94 - *! 95 - *! Revision 1.1 2001/03/20 09:13:50 magnusmn 96 - *! Linux 2.4 port 97 - *! 98 - *! Revision 1.10 2000/07/05 15:38:23 bjornw 99 - *! Dont update kernel time when a RTC_SET_TIME is done 100 - *! 101 - *! Revision 1.9 2000/03/02 15:42:59 macce 102 - *! * Hack to make RTC work on all 2100/2400 103 - *! 104 - *! Revision 1.8 2000/02/23 16:59:18 torbjore 105 - *! added setup of R_GEN_CONFIG when RTC is connected to the generic port. 106 - *! 107 - *! Revision 1.7 2000/01/17 15:51:43 johana 108 - *! Added RTC_SET_CHARGE ioctl to enable trickle charger. 109 - *! 110 - *! Revision 1.6 1999/10/27 13:19:47 bjornw 111 - *! Added update_xtime_from_cmos which reads back the updated RTC into the kernel. 112 - *! /dev/rtc calls it now. 113 - *! 114 - *! Revision 1.5 1999/10/27 12:39:37 bjornw 115 - *! Disabled superuser check. Anyone can now set the time. 116 - *! 117 - *! Revision 1.4 1999/09/02 13:27:46 pkj 118 - *! Added shadow for R_PORT_PB_CONFIG. 119 - *! Renamed port_g_shadow to port_g_data_shadow. 120 - *! 121 - *! Revision 1.3 1999/09/02 08:28:06 pkj 122 - *! Made it possible to select either port PB or the generic port for the RST 123 - *! signal line to the DS1302 RTC. 124 - *! Also make sure the RST bit is configured as output on Port PB (if used). 125 - *! 126 - *! Revision 1.2 1999/09/01 14:47:20 bjornw 127 - *! Added support for /dev/rtc operations with ioctl RD_TIME and SET_TIME to read 128 - *! and set the date. Register as major 121. 129 - *! 130 - *! Revision 1.1 1999/09/01 09:45:29 bjornw 131 - *! Implemented a DS1302 RTC driver. 132 - *! 133 - *! 134 9 *! --------------------------------------------------------------------------- 135 10 *! 136 - *! (C) Copyright 1999, 2000, 2001, 2002, 2003, 2004 Axis Communications AB, LUND, SWEDEN 137 - *! 138 - *! $Id: ds1302.c,v 1.18 2005/01/24 09:11:26 mikaelam Exp $ 11 + *! (C) Copyright 1999-2007 Axis Communications AB, LUND, SWEDEN 139 12 *! 140 13 *!***************************************************************************/ 141 14 ··· 28 155 #include <asm/io.h> 29 156 #include <asm/rtc.h> 30 157 #include <asm/arch/io_interface_mux.h> 158 + 159 + #include "i2c.h" 31 160 32 161 #define RTC_MAJOR_NR 121 /* local major, change later */ 33 162