diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/i2c | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/chips/tps65010.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c index 4ee56def61f2..214fbb1423c5 100644 --- a/drivers/i2c/chips/tps65010.c +++ b/drivers/i2c/chips/tps65010.c | |||
| @@ -308,7 +308,7 @@ static int dbg_tps_open(struct inode *inode, struct file *file) | |||
| 308 | return single_open(file, dbg_show, inode->i_private); | 308 | return single_open(file, dbg_show, inode->i_private); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | static struct file_operations debug_fops = { | 311 | static const struct file_operations debug_fops = { |
| 312 | .open = dbg_tps_open, | 312 | .open = dbg_tps_open, |
| 313 | .read = seq_read, | 313 | .read = seq_read, |
| 314 | .llseek = seq_lseek, | 314 | .llseek = seq_lseek, |
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index ac5bd2a7ca99..cb4fa9bef8cd 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
| @@ -392,7 +392,7 @@ static int i2cdev_release(struct inode *inode, struct file *file) | |||
| 392 | return 0; | 392 | return 0; |
| 393 | } | 393 | } |
| 394 | 394 | ||
| 395 | static struct file_operations i2cdev_fops = { | 395 | static const struct file_operations i2cdev_fops = { |
| 396 | .owner = THIS_MODULE, | 396 | .owner = THIS_MODULE, |
| 397 | .llseek = no_llseek, | 397 | .llseek = no_llseek, |
| 398 | .read = i2cdev_read, | 398 | .read = i2cdev_read, |