Merge with Linux 2.3.99-pre3.

2 files changed, 16 insertions, 15 deletions

diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index 5d71dc6ef..d6733d60b 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Apr 14 12:41:42 1998
- * Modified at:   Fri Jan 14 10:46:56 2000
+ * Modified at:   Mon Mar 20 09:08:57 2000
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1999-2000 Dag Brattli, All Rights Reserved.
@@ -73,18 +73,18 @@ typedef enum {
 	IRDA_TASK_CHILD_INIT,  /* Initializing child task */
 	IRDA_TASK_CHILD_WAIT,  /* Waiting for child task to finish */
 	IRDA_TASK_CHILD_DONE   /* Child task is finished */
-} TASK_STATE;
+} IRDA_TASK_STATE;
 
 struct irda_task;
-typedef int (*TASK_CALLBACK) (struct irda_task *task);
+typedef int (*IRDA_TASK_CALLBACK) (struct irda_task *task);
 
 struct irda_task {
 	queue_t q;
 	magic_t magic;
 
-	TASK_STATE state;
-	TASK_CALLBACK function;
-	TASK_CALLBACK finished;
+	IRDA_TASK_STATE state;
+	IRDA_TASK_CALLBACK function;
+	IRDA_TASK_CALLBACK finished;
 
 	struct irda_task *parent;
 	struct timer_list timer;
@@ -180,10 +180,11 @@ void setup_dma(int channel, char *buffer, int count, int mode);
 
 void irda_task_delete(struct irda_task *task);
 int  irda_task_kick(struct irda_task *task);
-struct irda_task *irda_task_execute(void *instance, TASK_CALLBACK function, 
-				    TASK_CALLBACK finished, 
+struct irda_task *irda_task_execute(void *instance, 
+				    IRDA_TASK_CALLBACK function, 
+				    IRDA_TASK_CALLBACK finished, 
 				    struct irda_task *parent, void *param);
-void irda_task_next_state(struct irda_task *task, TASK_STATE state);
+void irda_task_next_state(struct irda_task *task, IRDA_TASK_STATE state);
 
 extern const char *infrared_mode[];
 
diff --git a/include/net/irda/parameters.h b/include/net/irda/parameters.h
index 0bb658942..20f8a23c1 100644
--- a/include/net/irda/parameters.h
+++ b/include/net/irda/parameters.h
@@ -6,10 +6,10 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Mon Jun  7 08:47:28 1999
- * Modified at:   Mon Dec 13 11:51:59 1999
+ * Modified at:   Sun Jan 30 14:05:14 2000
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
- *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
+ *     Copyright (c) 1999-2000 Dag Brattli, All Rights Reserved.
  *     
  *     This program is free software; you can redistribute it and/or 
  *     modify it under the terms of the GNU General Public License as 
@@ -61,15 +61,15 @@ typedef union {
 	__u8  *bp;
 	__u16 *sp;
 	__u32 *ip;
-} pv_t;
+} irda_pv_t;
 
 typedef struct {
 	__u8 pi;
 	__u8 pl;
-	pv_t pv;
-} param_t;
+	irda_pv_t pv;
+} irda_param_t;
 
-typedef int (*PI_HANDLER)(void *self, param_t *param, int get);
+typedef int (*PI_HANDLER)(void *self, irda_param_t *param, int get);
 typedef int (*PV_HANDLER)(void *self, __u8 *buf, int len, __u8 pi,
 			  PV_TYPE type, PI_HANDLER func);