Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / hwmon / emc1403.c

diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index 99ac141bf3d779dcee41c2555957516a8e1db8d7..149dcb0e148f0842045a041e18d5a6417dc6b4b6 100644 (file)
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -41,8 +41,10 @@
 struct thermal_data {
        struct device *hwmon_dev;
        struct mutex mutex;
-       /* Cache the hyst value so we don't keep re-reading it. In theory
-          we could cache it forever as nobody else should be writing it. */
+       /*
+        * Cache the hyst value so we don't keep re-reading it. In theory
+        * we could cache it forever as nobody else should be writing it.
+        */
        u8 cached_hyst;
        unsigned long hyst_valid;
 };
@@ -283,8 +285,10 @@ static int emc1403_detect(struct i2c_client *client,
        case 0x23:
                strlcpy(info->type, "emc1423", I2C_NAME_SIZE);
                break;
-       /* Note: 0x25 is the 1404 which is very similar and this
-          driver could be extended */
+       /*
+        * Note: 0x25 is the 1404 which is very similar and this
+        * driver could be extended
+        */
        default:
                return -ENODEV;
        }