Staging: phison: depends on ATA_BMDMA

[safe/jmp/linux-2.6] / drivers / uwb / driver.c

diff --git a/drivers/uwb/driver.c b/drivers/uwb/driver.c
index 7eee8e4..08bd6db 100644 (file)
--- a/drivers/uwb/driver.c
+++ b/drivers/uwb/driver.c
@@ -53,7 +53,7 @@
 #include <linux/err.h>
 #include <linux/kdev_t.h>
 #include <linux/random.h>
-#include <linux/uwb/debug.h>
+
 #include "uwb-internal.h"
 
 
@@ -74,13 +74,16 @@
 unsigned long beacon_timeout_ms = 500;
 
 static
-ssize_t beacon_timeout_ms_show(struct class *class, char *buf)
+ssize_t beacon_timeout_ms_show(struct class *class,
+                               struct class_attribute *attr,
+                               char *buf)
 {
        return scnprintf(buf, PAGE_SIZE, "%lu\n", beacon_timeout_ms);
 }
 
 static
 ssize_t beacon_timeout_ms_store(struct class *class,
+                               struct class_attribute *attr,
                                const char *buf, size_t size)
 {
        unsigned long bt;
@@ -118,7 +121,7 @@ static int __init uwb_subsys_init(void)
        result = class_register(&uwb_rc_class);
        if (result < 0)
                goto error_uwb_rc_class_register;
-       uwbd_start();
+       uwb_dbg_init();
        return 0;
 
 error_uwb_rc_class_register:
@@ -130,7 +133,7 @@ module_init(uwb_subsys_init);
 
 static void __exit uwb_subsys_exit(void)
 {
-       uwbd_stop();
+       uwb_dbg_exit();
        class_unregister(&uwb_rc_class);
        uwb_est_destroy();
        return;