Merge tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[cascardo/linux.git] / drivers / staging / comedi / drivers / ni_stc.h

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index b3faed5..a284129 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -1285,14 +1285,6 @@ static inline unsigned MSeries_PFI_Output_Select_Source(unsigned channel,
        return (bits >> ((channel % 3) * 5)) & 0x1f;
 };
 
-enum MSeries_Gi_DMA_Config_Bits {
-       Gi_DMA_BankSW_Error_Bit = 0x10,
-       Gi_DMA_Reset_Bit = 0x8,
-       Gi_DMA_Int_Enable_Bit = 0x4,
-       Gi_DMA_Write_Bit = 0x2,
-       Gi_DMA_Enable_Bit = 0x1,
-};
-
 static inline unsigned MSeries_PFI_Filter_Select_Mask(unsigned channel)
 {
        return 0x3 << (channel * 2);
@@ -1406,10 +1398,9 @@ struct ni_board_struct {
        const struct comedi_lrange *ao_range_table;
        unsigned ao_speed;
 
-       unsigned num_p0_dio_channels;
-
        int reg_type;
        unsigned int has_8255:1;
+       unsigned int has_32dio_chan:1;
 
        enum caldac_enum caldac[3];
 };