Imported from util-linux-2.10s tarball.

[thirdparty/util-linux.git] / hwclock / cmos.c

diff --git a/clock/cmos.c b/hwclock/cmos.c
similarity index 98%
rename from clock/cmos.c
rename to hwclock/cmos.c
index 16705bf7feadc9464a1acb56b279e0918d5784ba..4fc82d7982d1a04f2f897fb1cb1396a9206a4844 100644 (file)
--- a/clock/cmos.c
+++ b/hwclock/cmos.c
@@ -184,10 +184,12 @@ set_cmos_access(int Jensen, int funky_toy) {
 
   /* see whether we are dealing with PC164/LX164/SX164, as they have a TOY
      that must be accessed differently to work correctly. */
+  /* Nautilus stuff reported by Neoklis Kyriazis */
   if (funky_toy ||
       is_in_cpuinfo("system variation", "PC164") ||
       is_in_cpuinfo("system variation", "LX164") ||
-      is_in_cpuinfo("system variation", "SX164")) {
+      is_in_cpuinfo("system variation", "SX164") ||
+      is_in_cpuinfo("system type", "Nautilus")) {
       funkyTOY = 1;
       if (debug) printf (_("funky TOY!\n"));
   }
@@ -553,7 +555,7 @@ set_hardware_clock_cmos(const struct tm *new_broken_time) {
 static int
 i386_iopl(const int level) {
 #if defined(__i386__) || defined(__alpha__)
-  extern int iopl(const int level);
+  extern int iopl(const int lvl);
   return iopl(level);
 #else
   return -2;