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
/
i2c
/
busses
/
i2c-savage4.c
diff --git
a/drivers/i2c/busses/i2c-savage4.c
b/drivers/i2c/busses/i2c-savage4.c
index
52d5194
..
0c85182
100644
(file)
--- a/
drivers/i2c/busses/i2c-savage4.c
+++ b/
drivers/i2c/busses/i2c-savage4.c
@@
-29,7
+29,6
@@
it easier to add later.
*/
it easier to add later.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-73,7
+72,7
@@
#define TIMEOUT (HZ / 2)
#define TIMEOUT (HZ / 2)
-static void *ioaddr;
+static void
__iomem
*ioaddr;
/* The sav GPIO registers don't have individual masks for each bit
so we always have to read before writing. */
/* The sav GPIO registers don't have individual masks for each bit
so we always have to read before writing. */
@@
-157,6
+156,8
@@
static struct pci_device_id savage4_ids[] __devinitdata = {
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, savage4_ids);
+
static int __devinit savage4_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
static int __devinit savage4_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
@@
-186,7
+187,7
@@
static struct pci_driver savage4_driver = {
static int __init i2c_savage4_init(void)
{
static int __init i2c_savage4_init(void)
{
- return pci_
module_init
(&savage4_driver);
+ return pci_
register_driver
(&savage4_driver);
}
static void __exit i2c_savage4_exit(void)
}
static void __exit i2c_savage4_exit(void)