diff options
| author | Karel Zak | 2006-12-07 00:25:53 +0100 |
|---|---|---|
| committer | Karel Zak | 2006-12-07 00:25:53 +0100 |
| commit | ffc4374869b9ac10539a3c18e13b29d1b0c64484 (patch) | |
| tree | 1b8054e83f7f70e8fa77499fc9246d1cc16faa15 /hwclock | |
| parent | Imported from util-linux-2.11n tarball. (diff) | |
| download | kernel-qcow2-util-linux-ffc4374869b9ac10539a3c18e13b29d1b0c64484.tar.gz kernel-qcow2-util-linux-ffc4374869b9ac10539a3c18e13b29d1b0c64484.tar.xz kernel-qcow2-util-linux-ffc4374869b9ac10539a3c18e13b29d1b0c64484.zip | |
Imported from util-linux-2.11o tarball.
Diffstat (limited to 'hwclock')
| -rw-r--r-- | hwclock/cmos.c | 6 | ||||
| -rw-r--r-- | hwclock/hwclock.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hwclock/cmos.c b/hwclock/cmos.c index 94153dea0..aed122cb1 100644 --- a/hwclock/cmos.c +++ b/hwclock/cmos.c @@ -49,8 +49,12 @@ #include "nls.h" -#if defined(__i386__) || defined(__alpha__) +#if defined(__i386__) #include <asm/io.h> /* for inb, outb */ +#elif defined(__alpha__) +/* <asm/io.h> fails to compile, probably because of u8 etc */ +extern unsigned int inb(unsigned long port); +extern void outb(unsigned char b,unsigned long port); #else void outb(int a, int b){} int inb(int c){ return 0; } diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c index 154ba0b83..20c548eb0 100644 --- a/hwclock/hwclock.c +++ b/hwclock/hwclock.c @@ -369,7 +369,7 @@ mktime_tz(struct tm tm, const bool universal, local time zone input, we may have to fake it out by temporarily changing the local time zone to UTC. */ - zone = (char *) getenv("TZ"); /* remember original time zone */ + zone = getenv("TZ"); /* remember original time zone */ if (universal) { /* Set timezone to UTC */ setenv("TZ", "", TRUE); |