Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[mv-sheeva.git] / drivers / staging / comedi / drivers / me4000.h

diff --git a/drivers/staging/comedi/drivers/me4000.h b/drivers/staging/comedi/drivers/me4000.h
index 22a25a463b8bd968e69a7a05ff2920aec105625b..733b19243c7563f89476211473fbca30f06e0633 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.h
+++ b/drivers/staging/comedi/drivers/me4000.h
@@ -369,14 +369,14 @@ struct me4000_dio_context {
        unsigned long port_3_reg;
 };
 
-typedef struct me4000_cnt_context {
+struct me4000_cnt_context {
        unsigned long ctrl_reg;
        unsigned long counter_0_reg;
        unsigned long counter_1_reg;
        unsigned long counter_2_reg;
-} me4000_cnt_context_t;
+};
 
-typedef struct me4000_info {
+struct me4000_info {
        unsigned long plx_regbase;      /*  PLX configuration space base address */
        unsigned long me4000_regbase;   /*  Base address of the ME4000 */
        unsigned long timer_regbase;    /*  Base address of the timer circuit */
@@ -400,9 +400,9 @@ typedef struct me4000_info {
        struct me4000_ao_context ao_context[4]; /*  Vector with analog output specific context */
        struct me4000_dio_context dio_context;  /*  Digital I/O specific context */
        struct me4000_cnt_context cnt_context;  /*  Counter specific context */
-} me4000_info_t;
+};
 
-#define info   ((me4000_info_t *)dev->private)
+#define info   ((struct me4000_info *)dev->private)
 
 /*-----------------------------------------------------------------------------
   Defines for analog input