Update of /cvsroot/linux-vax/kernel-2.4/arch/m68k/mvme16x
In directory usw-pr-cvs1:/tmp/cvs-serv13561/m68k/mvme16x
Modified Files:
config.c rtc.c
Log Message:
synch 2.4.15 commit 37
Index: config.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/mvme16x/config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.c 14 Jan 2001 19:41:57 -0000 1.1.1.1
+++ config.c 10 Apr 2002 14:34:36 -0000 1.2
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
-#include <linux/kd.h>
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/linkage.h>
@@ -30,11 +29,10 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
+#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
-int atari_SCC_reset_done = 1; /* So SCC doesn't get reset */
-u_long atari_mch_cookie = 0;
extern t_bdid mvme_bdid;
static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
Index: rtc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/mvme16x/rtc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- rtc.c 25 Feb 2001 23:15:20 -0000 1.1.1.2
+++ rtc.c 10 Apr 2002 14:34:36 -0000 1.2
@@ -72,7 +72,7 @@
unsigned char mon, day, hrs, min, sec, leap_yr;
unsigned int yrs;
- if (!suser())
+ if (!capable(CAP_SYS_ADMIN))
return -EACCES;
if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
|
