From c40a264bda63a94eb7c569a8c3398be6aafabf41 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 21 May 2008 12:52:33 -0700
Subject: [PATCH] --- yaml --- r: 104731 b: refs/heads/master c:
 7da5a05dd7b95315af49f724f623bbfdab0f5e4d h: refs/heads/master i:   104729:
 890009ee8fa71e0e7c0a9f89bb1dda1352413ea1   104727:
 728eb5b38e08b0fc477086fd62a971ee90637cae v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/misc/phantom.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 087e206f9e7a..74dc2f3b4e89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43f98747d48195d92c4102c17d7175bf24df1801
+refs/heads/master: 7da5a05dd7b95315af49f724f623bbfdab0f5e4d
diff --git a/trunk/drivers/misc/phantom.c b/trunk/drivers/misc/phantom.c
index 186162470090..4ce3bdc2f959 100644
--- a/trunk/drivers/misc/phantom.c
+++ b/trunk/drivers/misc/phantom.c
@@ -399,8 +399,9 @@ static int __devinit phantom_probe(struct pci_dev *pdev,
 		goto err_irq;
 	}
 
-	if (IS_ERR(device_create(phantom_class, &pdev->dev, MKDEV(phantom_major,
-			minor), "phantom%u", minor)))
+	if (IS_ERR(device_create_drvdata(phantom_class, &pdev->dev,
+					 MKDEV(phantom_major, minor),
+					 NULL, "phantom%u", minor)))
 		dev_err(&pdev->dev, "can't create device\n");
 
 	pci_set_drvdata(pdev, pht);