summaryrefslogtreecommitdiff
path: root/drivers/i2c/i2c-boardinfo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 03:54:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 03:54:13 +0300
commit444699c8503eaeb0cf15e24ad76f69b14df6097a (patch)
treea3c0573601942d86b1d4c1be4d446f31dfc78f5e /drivers/i2c/i2c-boardinfo.c
parent6113f39dd15e4beb5ce66a8e0d9062477c5e81e3 (diff)
parent662cda8abb278f58237fa12b8ab3060ebefca4b8 (diff)
downloadlinux-444699c8503eaeb0cf15e24ad76f69b14df6097a.tar.xz
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs i2c: Drop i2c_adapter.id i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter i2c-dev: Use standard bus notification mechanism i2c: Export i2c_for_each_dev i2c: Get rid of <linux/i2c-id.h> i2c: Minor fixes to upgrading-clients document i2c: make i2c_get_adapter prototype clearer i2c: Fix typo in instantiating-devices document i2c-boardinfo: Fix typo in comment
Diffstat (limited to 'drivers/i2c/i2c-boardinfo.c')
-rw-r--r--drivers/i2c/i2c-boardinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 7e6a63b57165..3ca2e012e789 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -1,5 +1,5 @@
/*
- * i2c-boardinfo.h - collect pre-declarations of I2C devices
+ * i2c-boardinfo.c - collect pre-declarations of I2C devices
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by