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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-voodoo3.c
diff --git
a/drivers/i2c/busses/i2c-voodoo3.c
b/drivers/i2c/busses/i2c-voodoo3.c
index
b914561
..
3edf0e3
100644
(file)
--- a/
drivers/i2c/busses/i2c-voodoo3.c
+++ b/
drivers/i2c/busses/i2c-voodoo3.c
@@
-61,7
+61,7
@@
#define TIMEOUT (HZ / 2)
#define TIMEOUT (HZ / 2)
-static void *ioaddr;
+static void
__iomem
*ioaddr;
/* The voo GPIO registers don't have individual masks for each bit
so we always have to read before writing. */
/* The voo GPIO registers don't have individual masks for each bit
so we always have to read before writing. */
@@
-195,6
+195,8
@@
static struct pci_device_id voodoo3_ids[] __devinitdata = {
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, voodoo3_ids);
+
static int __devinit voodoo3_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
static int __devinit voodoo3_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
@@
-232,7
+234,7
@@
static struct pci_driver voodoo3_driver = {
static int __init i2c_voodoo3_init(void)
{
static int __init i2c_voodoo3_init(void)
{
- return pci_
module_init
(&voodoo3_driver);
+ return pci_
register_driver
(&voodoo3_driver);
}
static void __exit i2c_voodoo3_exit(void)
}
static void __exit i2c_voodoo3_exit(void)