[Hackndev-commit] SF.net SVN: hackndev: [1048] linux4palm/linux/trunk/drivers/char

[<bob...@us...>]

Revision: 1048
          http://svn.sourceforge.net/hackndev/?rev=1048&view=rev
Author:   bobofdoom
Date:     2007-06-22 23:02:34 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
l4p: Disabled duplicate SA1100 RTC driver, use the one in drivers/rtc instead please.

Modified Paths:
--------------
    linux4palm/linux/trunk/drivers/char/Kconfig
    linux4palm/linux/trunk/drivers/char/sa1100-rtc.c

Modified: linux4palm/linux/trunk/drivers/char/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/char/Kconfig	2007-06-23 02:10:11 UTC (rev 1047)
+++ linux4palm/linux/trunk/drivers/char/Kconfig	2007-06-23 06:02:34 UTC (rev 1048)
@@ -810,19 +810,23 @@
 	  via the file /proc/rtc and its behaviour is set by various ioctls on
 	  /dev/rtc.
 
-config SA1100_RTC
-	tristate "SA11x0/PXA2xx RTC support"
-	depends on ARCH_SA1100 || ARCH_PXA
-	help
-	  If you say Y here and create a character special file /dev/rtc with
-	  major number 10 and minor number 135 using mknod ("man mknod"), you
-	  will get access to the real time clock built into your SA11x0 or
-	  PXA2xx CPU. It reports status information via the file /proc/rtc
-	  and its behaviour is set by various ioctls on /dev/rtc.
+#
+# This is a weird duplicate copy of the driver, please update your config to use
+# RTC_DRV_SA1100 instead! 
+#
+#config SA1100_RTC
+#	tristate "SA11x0/PXA2xx RTC support"
+#	depends on ARCH_SA1100 || ARCH_PXA
+#	help
+#	  If you say Y here and create a character special file /dev/rtc with
+#	  major number 10 and minor number 135 using mknod ("man mknod"), you
+#	  will get access to the real time clock built into your SA11x0 or
+#	  PXA2xx CPU. It reports status information via the file /proc/rtc
+#	  and its behaviour is set by various ioctls on /dev/rtc.
+#
+#	  To compile this driver as a module, choose M here: the
+#	  module will be called sa1100-rtc.
 
-	  To compile this driver as a module, choose M here: the
-	  module will be called sa1100-rtc.
-
 config GEN_RTC
 	tristate "Generic /dev/rtc emulation"
 	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV

Modified: linux4palm/linux/trunk/drivers/char/sa1100-rtc.c
===================================================================
--- linux4palm/linux/trunk/drivers/char/sa1100-rtc.c	2007-06-23 02:10:11 UTC (rev 1047)
+++ linux4palm/linux/trunk/drivers/char/sa1100-rtc.c	2007-06-23 06:02:34 UTC (rev 1048)
@@ -1,4 +1,16 @@
 /*
+ *
+ * NOTE: The file you're looking for is in drivers/rtc, please don't use this one
+ * it'll be removed eventually.
+ *
+ *
+ *
+ *
+ */
+#error This is a weird duplicate copy of the driver, please update your config to use \
+RTC_DRV_SA1100 instead!
+
+/*
  * linux/drivers/char/sa1100-rtc.c
  *
  * Real Time Clock interface for Linux on StrongARM SA1x00


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.