Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / input / misc / adxl34x.c

diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
index de5900d..144ddbd 100644 (file)
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
@@ -716,7 +716,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
        pdata = dev->platform_data;
        if (!pdata) {
                dev_dbg(dev,
-                       "No platfrom data: Using default initialization\n");
+                       "No platform data: Using default initialization\n");
                pdata = &adxl34x_default_init;
        }