2 files changed, 3 insertions, 9 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index f449daef3eed..23ae66c76d47 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1544,11 +1544,11 @@ static int __init capi_init(void)
                 return PTR_ERR(capi_class);
         }
 
-        class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
+        device_create(capi_class, NULL, MKDEV(capi_major, 0), "capi");
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         if (capinc_tty_init() < 0) {
-                class_device_destroy(capi_class, MKDEV(capi_major, 0));
+                device_destroy(capi_class, MKDEV(capi_major, 0));
                 class_destroy(capi_class);
                 unregister_chrdev(capi_major, "capi20");
                 return -ENOMEM;
@@ -1576,7 +1576,7 @@ static void __exit capi_exit(void)
 {
         proc_exit();
 
-        class_device_destroy(capi_class, MKDEV(capi_major, 0));
+        device_destroy(capi_class, MKDEV(capi_major, 0));
         class_destroy(capi_class);
         unregister_chrdev(capi_major, "capi20");
 
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index a0317abaeb11..02bdaf22d7ea 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -106,12 +106,6 @@ enum debuglevel {
                                          activated */
 };
 
-/* missing from linux/device.h ... */
-#ifndef dev_notice
-#define dev_notice(dev, format, arg...)         \
-        dev_printk(KERN_NOTICE , dev , format , ## arg)
-#endif
-
 /* Kernel message macros for situations where dev_printk and friends cannot be
  * used for lack of reliable access to a device structure.
  * linux/usb.h already contains these but in an obsolete form which clutters