diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/mips64/sgi-ip27 | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/mips64/sgi-ip27')
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-init.c | 1 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-irq.c | 3 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-rtc.c | 13 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-setup.c | 3 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-timer.c | 5 |
5 files changed, 6 insertions, 19 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-init.c b/arch/mips64/sgi-ip27/ip27-init.c index f6b3d6e09..e09bc6036 100644 --- a/arch/mips64/sgi-ip27/ip27-init.c +++ b/arch/mips64/sgi-ip27/ip27-init.c @@ -7,7 +7,6 @@ #include <asm/sn/klconfig.h> #include <asm/ioc3.h> #include <asm/mipsregs.h> -#include <asm/sn/klconfig.h> #include <asm/sn/gda.h> typedef unsigned long cpumask_t; /* into asm/sn/types.h */ diff --git a/arch/mips64/sgi-ip27/ip27-irq.c b/arch/mips64/sgi-ip27/ip27-irq.c index c9e6fe150..d7ddb8682 100644 --- a/arch/mips64/sgi-ip27/ip27-irq.c +++ b/arch/mips64/sgi-ip27/ip27-irq.c @@ -1,11 +1,10 @@ -/* $Id: ip27-irq.c,v 1.6 2000/02/10 05:58:56 dagum Exp $ +/* $Id: ip27-irq.c,v 1.7 2000/03/02 02:36:50 ralf Exp $ * * ip27-irq.c: Highlevel interrupt handling for IP27 architecture. * * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1999 Silicon Graphics, Inc. */ -#include <linux/config.h> #include <linux/init.h> #include <linux/errno.h> diff --git a/arch/mips64/sgi-ip27/ip27-rtc.c b/arch/mips64/sgi-ip27/ip27-rtc.c index bf85c06f2..e5f174ab1 100644 --- a/arch/mips64/sgi-ip27/ip27-rtc.c +++ b/arch/mips64/sgi-ip27/ip27-rtc.c @@ -192,16 +192,9 @@ static int rtc_release(struct inode *inode, struct file *file) */ static struct file_operations rtc_fops = { - NULL, /* No llseek (yet) */ - NULL, /* No read (yet) */ - NULL, /* No write */ - NULL, /* No readdir */ - NULL, /* No poll (yet) */ - rtc_ioctl, - NULL, /* No mmap */ - rtc_open, - NULL, /* flush */ - rtc_release + ioctl: rtc_ioctl, + open: rtc_open, + release: rtc_release, }; static struct miscdevice rtc_dev= diff --git a/arch/mips64/sgi-ip27/ip27-setup.c b/arch/mips64/sgi-ip27/ip27-setup.c index c97eeb8b6..f0d7d66ab 100644 --- a/arch/mips64/sgi-ip27/ip27-setup.c +++ b/arch/mips64/sgi-ip27/ip27-setup.c @@ -1,4 +1,4 @@ -/* $Id: ip27-setup.c,v 1.3 2000/01/21 22:34:03 ralf Exp $ +/* $Id: ip27-setup.c,v 1.6 2000/02/05 02:12:32 kanoj Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -19,7 +19,6 @@ #include <asm/sn/klconfig.h> #include <asm/ioc3.h> #include <asm/mipsregs.h> -#include <asm/sn/klconfig.h> /* Check against user dumbness. */ #ifdef CONFIG_VT diff --git a/arch/mips64/sgi-ip27/ip27-timer.c b/arch/mips64/sgi-ip27/ip27-timer.c index c75fa725f..ff6ea60e7 100644 --- a/arch/mips64/sgi-ip27/ip27-timer.c +++ b/arch/mips64/sgi-ip27/ip27-timer.c @@ -1,4 +1,4 @@ -/* $Id: ip27-timer.c,v 1.2 2000/01/27 01:05:24 ralf Exp $ +/* $Id: ip27-timer.c,v 1.3 2000/02/18 09:54:40 ulfc Exp $ * * Copytight (C) 1999 Ralf Baechle (ralf@gnu.org) * Copytight (C) 1999 Silicon Graphics, Inc. @@ -148,13 +148,10 @@ void do_settimeofday(struct timeval *tv) } /* Includes for ioc3_init(). */ -#include <linux/init.h> #include <asm/sn/types.h> #include <asm/sn/sn0/addrs.h> #include <asm/sn/sn0/hubni.h> #include <asm/sn/sn0/hubio.h> -#include <asm/sn/klconfig.h> -#include <asm/ioc3.h> #include <asm/pci/bridge.h> /* Converts Gregorian date to seconds since 1970-01-01 00:00:00. |