Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (46 commits)
  UIO: Fix mapping of logical and virtual memory
  UIO: add automata sercos3 pci card support
  UIO: Change driver name of uio_pdrv
  UIO: Add alignment warnings for uio-mem
  Driver core: add bus_sort_breadthfirst() function
  NET: convert the phy_device file to use bus_find_device_by_name
  kobject: Cleanup kobject_rename and !CONFIG_SYSFS
  kobject: Fix kobject_rename and !CONFIG_SYSFS
  sysfs: Make dir and name args to sysfs_notify() const
  platform: add new device registration helper
  sysfs: use ilookup5() instead of ilookup5_nowait()
  PNP: create device attributes via default device attributes
  Driver core: make bus_find_device_by_name() more robust
  usb: turn dev_warn+WARN_ON combos into dev_WARN
  debug: use dev_WARN() rather than WARN_ON() in device_pm_add()
  debug: Introduce a dev_WARN() function
  sysfs: fix deadlock
  device model: Do a quickcheck for driver binding before doing an expensive check
  Driver core: Fix cleanup in device_create_vargs().
  Driver core: Clarify device cleanup.
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 6774572d3759..70e0ebc30bd0 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -745,12 +745,12 @@ static int __init ip2_loadmain(void)
 
                 pB = i2BoardPtrTable[i];
                 if (pB != NULL) {
-                        device_create_drvdata(ip2_class, NULL,
-                                              MKDEV(IP2_IPL_MAJOR, 4 * i),
-                                              NULL, "ipl%d", i);
-                        device_create_drvdata(ip2_class, NULL,
-                                              MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
-                                              NULL, "stat%d", i);
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i),
+                                      NULL, "ipl%d", i);
+                        device_create(ip2_class, NULL,
+                                      MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
+                                      NULL, "stat%d", i);
 
                         for (box = 0; box < ABS_MAX_BOXES; box++)
                                 for (j = 0; j < ABS_BIGGEST_BOX; j++)