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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-amd756.c
diff --git
a/drivers/i2c/busses/i2c-amd756.c
b/drivers/i2c/busses/i2c-amd756.c
index
eca5ed3
..
1750ded
100644
(file)
--- a/
drivers/i2c/busses/i2c-amd756.c
+++ b/
drivers/i2c/busses/i2c-amd756.c
@@
-37,7
+37,6
@@
Note: we assume there can only be one device, with one SMBus interface.
*/
Note: we assume there can only be one device, with one SMBus interface.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
@@
-86,8
+85,8
@@
#define AMD756_PROCESS_CALL 0x04
#define AMD756_BLOCK_DATA 0x05
#define AMD756_PROCESS_CALL 0x04
#define AMD756_BLOCK_DATA 0x05
-
-static unsigned short amd756_ioport
= 0
;
+static struct pci_driver amd756_driver;
+static unsigned short amd756_ioport;
/*
SMBUS event = I/O 28-29 bit 11
/*
SMBUS event = I/O 28-29 bit 11
@@
-296,8
+295,6
@@
static u32 amd756_func(struct i2c_adapter *adapter)
}
static struct i2c_algorithm smbus_algorithm = {
}
static struct i2c_algorithm smbus_algorithm = {
- .name = "Non-I2C SMBus adapter",
- .id = I2C_ALGO_SMBUS,
.smbus_xfer = amd756_access,
.functionality = amd756_func,
};
.smbus_xfer = amd756_access,
.functionality = amd756_func,
};
@@
-306,7
+303,6
@@
struct i2c_adapter amd756_smbus = {
.owner = THIS_MODULE,
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
.owner = THIS_MODULE,
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
- .name = "unset",
};
enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 };
};
enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 };
@@
-368,7
+364,7
@@
static int __devinit amd756_probe(struct pci_dev *pdev,
amd756_ioport += SMB_ADDR_OFFSET;
}
amd756_ioport += SMB_ADDR_OFFSET;
}
- if (!request_region(amd756_ioport, SMB_IOSIZE,
"amd756-smbus"
)) {
+ if (!request_region(amd756_ioport, SMB_IOSIZE,
amd756_driver.name
)) {
dev_err(&pdev->dev, "SMB region 0x%x already in use!\n",
amd756_ioport);
return -ENODEV;
dev_err(&pdev->dev, "SMB region 0x%x already in use!\n",
amd756_ioport);
return -ENODEV;