git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
input
/
serio
/
hp_sdc.c
diff --git
a/drivers/input/serio/hp_sdc.c
b/drivers/input/serio/hp_sdc.c
index
7629452
..
a10348b
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 = {
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,
};
.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.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();
}
return hp_sdc_init();
}