aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10/drivers/i2c.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-02 09:41:56 -0400
commit29c798fecb9b846b363b0a02fa662ff42fc19426 (patch)
treee708d6aca8f098e69571780f702325b221b66694 /arch/cris/arch-v10/drivers/i2c.c
parentASoC: fix the building issue of missing codec field in 'struct snd_soc_card' (diff)
parentLinux 2.6.37-rc1 (diff)
downloadlinux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.tar.xz
linux-dev-29c798fecb9b846b363b0a02fa662ff42fc19426.zip
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'arch/cris/arch-v10/drivers/i2c.c')
-rw-r--r--arch/cris/arch-v10/drivers/i2c.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c
index 77a941813819..c413539d4205 100644
--- a/arch/cris/arch-v10/drivers/i2c.c
+++ b/arch/cris/arch-v10/drivers/i2c.c
@@ -617,6 +617,7 @@ static const struct file_operations i2c_fops = {
.unlocked_ioctl = i2c_ioctl,
.open = i2c_open,
.release = i2c_release,
+ .llseek = noop_llseek,
};
int __init