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
/
sh
/
boards
/
overdrive
/
setup.c
diff --git
a/arch/sh/boards/overdrive/setup.c
b/arch/sh/boards/overdrive/setup.c
index
a36ce02
..
a3a7744
100644
(file)
--- a/
arch/sh/boards/overdrive/setup.c
+++ b/
arch/sh/boards/overdrive/setup.c
@@
-9,7
+9,6
@@
* STMicroelectronics Overdrive Support.
*/
* STMicroelectronics Overdrive Support.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <asm/io.h>
@@
-17,8
+16,6
@@
#include <asm/overdrive/overdrive.h>
#include <asm/overdrive/fpga.h>
#include <asm/overdrive/overdrive.h>
#include <asm/overdrive/fpga.h>
-extern void od_time_init(void);
-
const char *get_system_type(void)
{
return "SH7750 Overdrive";
const char *get_system_type(void)
{
return "SH7750 Overdrive";
@@
-31,11
+28,9
@@
int __init platform_setup(void)
{
#ifdef CONFIG_PCI
init_overdrive_fpga();
{
#ifdef CONFIG_PCI
init_overdrive_fpga();
- galileo_init();
+ galileo_init();
#endif
#endif
- board_time_init = od_time_init;
-
/* Enable RS232 receive buffers */
writel(0x1e, OVERDRIVE_CTRL);
}
/* Enable RS232 receive buffers */
writel(0x1e, OVERDRIVE_CTRL);
}