busybox: refresh busybox patches

[openwrt-10.03/.git] / package / button-hotplug / src / button-hotplug.c

diff --git a/package/button-hotplug/src/button-hotplug.c b/package/button-hotplug/src/button-hotplug.c
index 3b5527fcf2f9d862376a5ad8ea770d1a362b0ad9..4bdf36435af9c735b0ccbd0b82266c95e1334525 100644 (file)
--- a/package/button-hotplug/src/button-hotplug.c
+++ b/package/button-hotplug/src/button-hotplug.c
@@ -24,7 +24,7 @@
 #include <net/sock.h>
 
 #define DRV_NAME       "button-hotplug"
-#define DRV_VERSION    "0.3.0"
+#define DRV_VERSION    "0.3.1"
 #define DRV_DESC       "Button Hotplug driver"
 
 #define BH_SKB_SIZE    2048
@@ -36,15 +36,19 @@
 
 #define PFX    DRV_NAME ": "
 
-/*#define BH_DEBUG*/
+#undef BH_DEBUG
 
 #ifdef BH_DEBUG
-#define BH_DBG(fmt, args...) printk(KERN_DEBUG "%s" fmt, ##args )
+#define BH_DBG(fmt, args...) printk(KERN_DEBUG "%s: " fmt, DRV_NAME, ##args )
 #else
 #define BH_DBG(fmt, args...) do {} while (0)
 #endif
 
-#define BH_ERR(fmt, args...) printk(KERN_ERR "%s" fmt, ##args )
+#define BH_ERR(fmt, args...) printk(KERN_ERR "%s: " fmt, DRV_NAME, ##args )
+
+#ifndef BIT_MASK
+#define BIT_MASK(nr)            (1UL << ((nr) % BITS_PER_LONG))
+#endif
 
 struct bh_priv {
        unsigned long           seen[BH_BTN_COUNT];