diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/parisc/lasi.c | |
| parent | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
| download | kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.gz kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.bz2 | |
Merge branch 'upstream'
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 cb84a4e..a8c2039 100644 --- a/drivers/parisc/lasi.c +++ b/drivers/parisc/lasi.c @@ -175,7 +175,7 @@ lasi_init_chip(struct parisc_device *dev) return -ENOMEM; lasi->name = "Lasi"; - lasi->hpa = dev->hpa; + lasi->hpa = dev->hpa.start; /* Check the 4-bit (yes, only 4) version register */ lasi->version = gsc_readl(lasi->hpa + LASI_VER) & 0xf; @@ -233,7 +233,7 @@ static struct parisc_device_id lasi_tbl[] = { }; struct parisc_driver lasi_driver = { - .name = "Lasi", + .name = "lasi", .id_table = lasi_tbl, .probe = lasi_init_chip, }; |