git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
myri10ge: fix stop/go mmio ordering
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
rack-meter.c
diff --git
a/drivers/macintosh/rack-meter.c
b/drivers/macintosh/rack-meter.c
index
f83fad2
..
2c21d4f
100644
(file)
--- a/
drivers/macintosh/rack-meter.c
+++ b/
drivers/macintosh/rack-meter.c
@@
-30,7
+30,6
@@
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#include <asm/dbdma.h>
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#include <asm/dbdma.h>
-#include <asm/dbdma.h>
#include <asm/macio.h>
#include <asm/keylargo.h>
#include <asm/macio.h>
#include <asm/keylargo.h>
@@
-387,7
+386,7
@@
static int __devinit rackmeter_probe(struct macio_dev* mdev,
if (strcmp(np->name, "lightshow") == 0)
break;
if ((strcmp(np->name, "sound") == 0) &&
if (strcmp(np->name, "lightshow") == 0)
break;
if ((strcmp(np->name, "sound") == 0) &&
- get_property(np, "virtual", NULL) != NULL)
+
of_
get_property(np, "virtual", NULL) != NULL)
break;
}
if (np == NULL) {
break;
}
if (np == NULL) {