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
/
galileo-boards
/
ev96100
/
setup.c
diff --git
a/arch/mips/galileo-boards/ev96100/setup.c
b/arch/mips/galileo-boards/ev96100/setup.c
index
78dbb18
..
639ad55
100644
(file)
--- a/
arch/mips/galileo-boards/ev96100/setup.c
+++ b/
arch/mips/galileo-boards/ev96100/setup.c
@@
-32,7
+32,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/init.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/ioport.h>
@@
-55,7
+54,7
@@
extern void mips_reboot_setup(void);
unsigned char mac_0_1[12];
unsigned char mac_0_1[12];
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
unsigned int config = read_c0_config();
unsigned int status = read_c0_status();
{
unsigned int config = read_c0_config();
unsigned int status = read_c0_status();