---

yaml --- r: 200118 b: refs/heads/master c: 56960b3 h: refs/heads/master v: v3
git-mirror · Jun 2, 2010 · 8399a59 · 8399a59
1 parent 9cce613
commit 8399a59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7a2e30246281944064113dafbafe3eb14cd89e3
+refs/heads/master: 56960b3602be6fde9f09c7958fa06b26384307cc
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
@@ -1164,7 +1164,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 	ts->reg = regulator_get(&spi->dev, "vcc");
 	if (IS_ERR(ts->reg)) {
 		err = PTR_ERR(ts->reg);
-		dev_err(&spi->dev, "unable to get regulator: %ld\n", err);
+		dev_err(&spi->dev, "unable to get regulator: %d\n", err);
 		goto err_free_gpio;
 	}