diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/parisc/wax.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/parisc/wax.c')
| -rw-r--r-- | drivers/parisc/wax.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c index e547d7d024d8..17dce2adf7fe 100644 --- a/drivers/parisc/wax.c +++ b/drivers/parisc/wax.c | |||
| @@ -81,7 +81,7 @@ wax_init_chip(struct parisc_device *dev) | |||
| 81 | return -ENOMEM; | 81 | return -ENOMEM; |
| 82 | 82 | ||
| 83 | wax->name = "wax"; | 83 | wax->name = "wax"; |
| 84 | wax->hpa = dev->hpa; | 84 | wax->hpa = dev->hpa.start; |
| 85 | 85 | ||
| 86 | wax->version = 0; /* gsc_readb(wax->hpa+WAX_VER); */ | 86 | wax->version = 0; /* gsc_readb(wax->hpa+WAX_VER); */ |
| 87 | printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa); | 87 | printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa); |