summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-07 02:05:40 -0500
committerLen Brown <len.brown@intel.com>2006-01-07 02:05:40 -0500
commitadd5b5ee992e40c9cd8697ea94c223628be162a7 (patch)
tree7f3f279f3e6b41e61d7dfaf4d25a5251024a7185 /drivers/video
parent25da0974601fc8096461f3d3f7ca3aab8e79adfb (diff)
parent0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff)
downloadlinux-add5b5ee992e40c9cd8697ea94c223628be162a7.tar.bz2
Auto-update from upstream
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/matrox/matroxfb_maven.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index ad60bbb16cdf..a1f2c5e8fc88 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1288,18 +1288,13 @@ static int maven_detach_client(struct i2c_client* client) {
return 0;
}
-static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg) {
- return -ENOIOCTLCMD; /* or -EINVAL, depends on who will call this */
-}
-
static struct i2c_driver maven_driver={
- .owner = THIS_MODULE,
- .name = "maven",
+ .driver = {
+ .name = "maven",
+ },
.id = I2C_DRIVERID_MGATVO,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = maven_attach_adapter,
.detach_client = maven_detach_client,
- .command = maven_command,
};
/* ************************** */