Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / input / serio / hp_sdc.c

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 7629452dd64b0d65e30cd1e53e9f112027ffe977..a10348bb25e983e4a69cc16ed648e4f4bc904c90 100644 (file)
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -764,7 +764,7 @@ MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl);
 static int __init hp_sdc_init_hppa(struct parisc_device *d);
 
 static struct parisc_driver hp_sdc_driver = {
-       .name =         "HP SDC",
+       .name =         "hp_sdc",
        .id_table =     hp_sdc_tbl,
        .probe =        hp_sdc_init_hppa,
 };
@@ -875,9 +875,9 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
        hp_sdc.dev              = d;
        hp_sdc.irq              = d->irq;
        hp_sdc.nmi              = d->aux_irq;
-       hp_sdc.base_io          = d->hpa;
-       hp_sdc.data_io          = d->hpa + 0x800;
-       hp_sdc.status_io        = d->hpa + 0x801;
+       hp_sdc.base_io          = d->hpa.start;
+       hp_sdc.data_io          = d->hpa.start + 0x800;
+       hp_sdc.status_io        = d->hpa.start + 0x801;
 
        return hp_sdc_init();
 }