projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
drivers
/
macintosh
/
rack-meter.c
diff --git
a/drivers/macintosh/rack-meter.c
b/drivers/macintosh/rack-meter.c
index
5ed41fe
..
4177ff0
100644
(file)
--- a/
drivers/macintosh/rack-meter.c
+++ b/
drivers/macintosh/rack-meter.c
@@
-171,11
+171,11
@@
static void rackmeter_setup_dbdma(struct rackmeter *rm)
/* Make sure dbdma is reset */
DBDMA_DO_RESET(rm->dma_regs);
/* Make sure dbdma is reset */
DBDMA_DO_RESET(rm->dma_regs);
- pr_debug("rackmeter: mark offset=0x%
l
x\n",
+ pr_debug("rackmeter: mark offset=0x%
z
x\n",
offsetof(struct rackmeter_dma, mark));
offsetof(struct rackmeter_dma, mark));
- pr_debug("rackmeter: buf1 offset=0x%
l
x\n",
+ pr_debug("rackmeter: buf1 offset=0x%
z
x\n",
offsetof(struct rackmeter_dma, buf1));
offsetof(struct rackmeter_dma, buf1));
- pr_debug("rackmeter: buf2 offset=0x%
l
x\n",
+ pr_debug("rackmeter: buf2 offset=0x%
z
x\n",
offsetof(struct rackmeter_dma, buf2));
/* Prepare 4 dbdma commands for the 2 buffers */
offsetof(struct rackmeter_dma, buf2));
/* Prepare 4 dbdma commands for the 2 buffers */
@@
-387,7
+387,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) {