Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / comedi / drivers / das08.h

diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h
index 6342fbaf7bf0903a276a8fd277d7935b689787fc..69089ce690f2086d45adcf2ba6de4e4f7a397d35 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.h
+++ b/drivers/staging/comedi/drivers/das08.h
@@ -30,7 +30,7 @@ enum das08_ai_encoding { das08_encode12, das08_encode16, das08_pcm_encode12 };
 enum das08_lrange { das08_pg_none, das08_bipolar5, das08_pgh, das08_pgl,
                das08_pgm };
 
-typedef struct das08_board_struct {
+struct das08_board_struct {
        const char *name;
        unsigned int id;        // id for pci/pcmcia boards
        enum das08_bustype bustype;
@@ -46,7 +46,7 @@ typedef struct das08_board_struct {
        unsigned int i8255_offset;
        unsigned int i8254_offset;
        unsigned int iosize;    // number of ioports used
-} das08_board;
+};
 
 struct i8254_struct {
        int channels;           // available channels. Some could be used internally.
@@ -72,7 +72,7 @@ struct das08_private_struct {
 #define NUM_DAS08_CS_BOARDS 2
 extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS];
 
-int das08_common_attach(comedi_device * dev, unsigned long iobase);
-int das08_common_detach(comedi_device * dev);
+int das08_common_attach(struct comedi_device * dev, unsigned long iobase);
+int das08_common_detach(struct comedi_device * dev);
 
 #endif /* _DAS08_H */