Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / drivers / hwmon / hdaps.c

diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index f82fa2d23f9529febecc64209a129e60b1d9c269..a7c6d407572b43c53a417c939cb8cdc6fdacecf3 100644 (file)
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -480,14 +480,14 @@ static struct attribute_group hdaps_attribute_group = {
 /* Module stuff */
 
 /* hdaps_dmi_match - found a match.  return one, short-circuiting the hunt. */
-static int __init hdaps_dmi_match(struct dmi_system_id *id)
+static int __init hdaps_dmi_match(const struct dmi_system_id *id)
 {
        printk(KERN_INFO "hdaps: %s detected.\n", id->ident);
        return 1;
 }
 
 /* hdaps_dmi_match_invert - found an inverted match. */
-static int __init hdaps_dmi_match_invert(struct dmi_system_id *id)
+static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
 {
        hdaps_invert = 1;
        printk(KERN_INFO "hdaps: inverting axis readings.\n");
@@ -574,7 +574,7 @@ static int __init hdaps_init(void)
 
        /* initialize the input class */
        hdaps_idev->name = "hdaps";
-       hdaps_idev->cdev.dev = &pdev->dev;
+       hdaps_idev->dev.parent = &pdev->dev;
        hdaps_idev->evbit[0] = BIT(EV_ABS);
        input_set_abs_params(hdaps_idev, ABS_X,
                        -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);