X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fdiag.h;h=93fdedb85cbd3b4a5ce5ae3ceca2b027ba755f1b;hb=4e7d27c89015a1ca768e10254b1eb472d3e8021c;hp=af30823aae1b2a0975eeea11cfd3cc06146975b2;hpb=fca1e2883934a6d918878c05ddbea9aadb91b2a5;p=openwrt-10.03%2F.git

diff --git a/package/broadcom-diag/src/diag.h b/package/broadcom-diag/src/diag.h
index af30823aa..93fdedb85 100644
--- a/package/broadcom-diag/src/diag.h
+++ b/package/broadcom-diag/src/diag.h
@@ -21,6 +21,7 @@
  * $Id:$
  */
 
+#include <linux/irq.h>
 #define MODULE_NAME "diag"
 
 #define MAX_GPIO 8
@@ -73,9 +74,16 @@ struct platform_t {
 
 struct event_t {
 	struct work_struct wq;
-	char buf[256];
-	char *argv[3];
-	char *envp[6];
+	unsigned long seen;
+	char *name, *action;
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+	struct sk_buff *skb;
+#else
+	char *scratch;
+	char *argv[4];
+	char *envp[7];
+	u8 enr, anr;
+#endif
 };
 
 extern char *nvram_get(char *str);
@@ -87,8 +95,13 @@ static struct platform_t platform;
 static void register_buttons(struct button_t *b);
 static void unregister_buttons(struct button_t *b);
 
+#ifndef LINUX_2_4
+static void hotplug_button(struct work_struct *work);
+static irqreturn_t button_handler(int irq, void *dev_id);
+#else
 static void hotplug_button(struct event_t *event);
 static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs);
+#endif
 
 /* leds */