diff options
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/hp_sdc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 4bad2810190c..9790d7169a53 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
| @@ -331,7 +331,7 @@ static int __init gscps2_probe(struct parisc_device *dev) | |||
| 331 | { | 331 | { |
| 332 | struct gscps2port *ps2port; | 332 | struct gscps2port *ps2port; |
| 333 | struct serio *serio; | 333 | struct serio *serio; |
| 334 | unsigned long hpa = dev->hpa; | 334 | unsigned long hpa = dev->hpa.start; |
| 335 | int ret; | 335 | int ret; |
| 336 | 336 | ||
| 337 | if (!dev->irq) | 337 | if (!dev->irq) |
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 045b9a7a9dbb..a10348bb25e9 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c | |||
| @@ -875,9 +875,9 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d) | |||
| 875 | hp_sdc.dev = d; | 875 | hp_sdc.dev = d; |
| 876 | hp_sdc.irq = d->irq; | 876 | hp_sdc.irq = d->irq; |
| 877 | hp_sdc.nmi = d->aux_irq; | 877 | hp_sdc.nmi = d->aux_irq; |
| 878 | hp_sdc.base_io = d->hpa; | 878 | hp_sdc.base_io = d->hpa.start; |
| 879 | hp_sdc.data_io = d->hpa + 0x800; | 879 | hp_sdc.data_io = d->hpa.start + 0x800; |
| 880 | hp_sdc.status_io = d->hpa + 0x801; | 880 | hp_sdc.status_io = d->hpa.start + 0x801; |
| 881 | 881 | ||
| 882 | return hp_sdc_init(); | 882 | return hp_sdc_init(); |
| 883 | } | 883 | } |