diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/parisc/ccio-rm-dma.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/parisc/ccio-rm-dma.c')
| -rw-r--r-- | drivers/parisc/ccio-rm-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c index 57e6385976e2..356b8357bccc 100644 --- a/drivers/parisc/ccio-rm-dma.c +++ b/drivers/parisc/ccio-rm-dma.c | |||
| @@ -167,7 +167,7 @@ ccio_probe(struct parisc_device *dev) | |||
| 167 | { | 167 | { |
| 168 | printk(KERN_INFO "%s found %s at 0x%lx\n", MODULE_NAME, | 168 | printk(KERN_INFO "%s found %s at 0x%lx\n", MODULE_NAME, |
| 169 | dev->id.hversion == U2_BC_GSC ? "U2" : "UTurn", | 169 | dev->id.hversion == U2_BC_GSC ? "U2" : "UTurn", |
| 170 | dev->hpa); | 170 | dev->hpa.start); |
| 171 | 171 | ||
| 172 | /* | 172 | /* |
| 173 | ** FIXME - should check U2 registers to verify it's really running | 173 | ** FIXME - should check U2 registers to verify it's really running |