git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
tx4927
/
common
/
tx4927_setup.c
diff --git
a/arch/mips/tx4927/common/tx4927_setup.c
b/arch/mips/tx4927/common/tx4927_setup.c
index
77c3b66
..
3ace403
100644
(file)
--- a/
arch/mips/tx4927/common/tx4927_setup.c
+++ b/
arch/mips/tx4927/common/tx4927_setup.c
@@
-24,7
+24,6
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
@@
-51,7
+50,6
@@
#undef DEBUG
void __init tx4927_time_init(void);
#undef DEBUG
void __init tx4927_time_init(void);
-void __init tx4927_timer_setup(struct irqaction *irq);
void dump_cp0(char *key);
void dump_cp0(char *key);
@@
-64,10
+62,9
@@
static void tx4927_write_buffer_flush(void)
}
}
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
board_time_init = tx4927_time_init;
{
board_time_init = tx4927_time_init;
- board_timer_setup = tx4927_timer_setup;
__wbflush = tx4927_write_buffer_flush;
#ifdef CONFIG_TOSHIBA_RBTX4927
__wbflush = tx4927_write_buffer_flush;
#ifdef CONFIG_TOSHIBA_RBTX4927
@@
-92,7
+89,7
@@
void __init tx4927_time_init(void)
}
}
-void __init
tx4927
_timer_setup(struct irqaction *irq)
+void __init
plat
_timer_setup(struct irqaction *irq)
{
u32 count;
u32 c1;
{
u32 count;
u32 c1;