diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 11:53:29 -0500 |
commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
tree | 9336a14058eed66c335db10512f33a31f9e8c938 /arch/mips/kernel/rtlx.c | |
parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/kernel/rtlx.c')
-rw-r--r-- | arch/mips/kernel/rtlx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c index 1d855112bac2..986a9cf23067 100644 --- a/arch/mips/kernel/rtlx.c +++ b/arch/mips/kernel/rtlx.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2005 MIPS Technologies, Inc. All rights reserved. | 2 | * Copyright (C) 2005 MIPS Technologies, Inc. All rights reserved. |
3 | * Copyright (C) 2005, 06 Ralf Baechle (ralf@linux-mips.org) | ||
3 | * | 4 | * |
4 | * This program is free software; you can distribute it and/or modify it | 5 | * This program is free software; you can distribute it and/or modify it |
5 | * under the terms of the GNU General Public License (Version 2) as | 6 | * under the terms of the GNU General Public License (Version 2) as |
@@ -20,9 +21,12 @@ | |||
20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
21 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/irq.h> | ||
23 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
24 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
25 | #include <linux/wait.h> | 28 | #include <linux/wait.h> |
29 | |||
26 | #include <asm/mipsmtregs.h> | 30 | #include <asm/mipsmtregs.h> |
27 | #include <asm/bitops.h> | 31 | #include <asm/bitops.h> |
28 | #include <asm/cpu.h> | 32 | #include <asm/cpu.h> |