diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/parisc/lasi.c | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/parisc/lasi.c')
| -rw-r--r-- | drivers/parisc/lasi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c index cb84a4e84a2f..a8c20396ffbe 100644 --- a/drivers/parisc/lasi.c +++ b/drivers/parisc/lasi.c | |||
| @@ -175,7 +175,7 @@ lasi_init_chip(struct parisc_device *dev) | |||
| 175 | return -ENOMEM; | 175 | return -ENOMEM; |
| 176 | 176 | ||
| 177 | lasi->name = "Lasi"; | 177 | lasi->name = "Lasi"; |
| 178 | lasi->hpa = dev->hpa; | 178 | lasi->hpa = dev->hpa.start; |
| 179 | 179 | ||
| 180 | /* Check the 4-bit (yes, only 4) version register */ | 180 | /* Check the 4-bit (yes, only 4) version register */ |
| 181 | lasi->version = gsc_readl(lasi->hpa + LASI_VER) & 0xf; | 181 | lasi->version = gsc_readl(lasi->hpa + LASI_VER) & 0xf; |
| @@ -233,7 +233,7 @@ static struct parisc_device_id lasi_tbl[] = { | |||
| 233 | }; | 233 | }; |
| 234 | 234 | ||
| 235 | struct parisc_driver lasi_driver = { | 235 | struct parisc_driver lasi_driver = { |
| 236 | .name = "Lasi", | 236 | .name = "lasi", |
| 237 | .id_table = lasi_tbl, | 237 | .id_table = lasi_tbl, |
| 238 | .probe = lasi_init_chip, | 238 | .probe = lasi_init_chip, |
| 239 | }; | 239 | }; |