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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
tc
/
zs.c
diff --git
a/drivers/tc/zs.c
b/drivers/tc/zs.c
index
2904b0a
..
7391ae6
100644
(file)
--- a/
drivers/tc/zs.c
+++ b/
drivers/tc/zs.c
@@
-67,7
+67,7
@@
#include <asm/uaccess.h>
#include <asm/wbflush.h>
#include <asm/bootinfo.h>
#include <asm/uaccess.h>
#include <asm/wbflush.h>
#include <asm/bootinfo.h>
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
#include <asm/dec/interrupts.h>
#include <asm/dec/machtype.h>
#include <asm/dec/tc.h>
#include <asm/dec/interrupts.h>
#include <asm/dec/machtype.h>
#include <asm/dec/tc.h>
@@
-111,7
+111,7
@@
struct zs_parms {
static struct zs_parms *zs_parms;
static struct zs_parms *zs_parms;
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
static struct zs_parms ds_parms = {
scc0 : SCC0,
scc1 : SCC1,
static struct zs_parms ds_parms = {
scc0 : SCC0,
scc1 : SCC1,
@@
-132,7
+132,7
@@
static struct zs_parms baget_parms = {
};
#endif
};
#endif
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
#define DS_BUS_PRESENT (IOASIC)
#else
#define DS_BUS_PRESENT 0
#define DS_BUS_PRESENT (IOASIC)
#else
#define DS_BUS_PRESENT 0
@@
-1689,7
+1689,7
@@
static void __init probe_sccs(void)
* system_base for this case :-(. HK
*/
switch(mips_machtype) {
* system_base for this case :-(. HK
*/
switch(mips_machtype) {
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
case MACH_DS5000_2X0:
system_base = 0xbf800000;
n_chips = 2;
case MACH_DS5000_2X0:
system_base = 0xbf800000;
n_chips = 2;