diff --git a/[refs] b/[refs] index 25934f643a7f..56bf49bfe141 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 055f6636d9eb27bc13236e07739e019496c21221 +refs/heads/master: 39f7666080909466c0ed6d5fa48cce3403033ced diff --git a/trunk/drivers/staging/comedi/drivers/s526.c b/trunk/drivers/staging/comedi/drivers/s526.c index 939e17f993d9..5d98162734b5 100644 --- a/trunk/drivers/staging/comedi/drivers/s526.c +++ b/trunk/drivers/staging/comedi/drivers/s526.c @@ -146,10 +146,10 @@ enum S526_GPCT_APP_CLASS { /* Config struct for different GPCT subdevice Application Classes and their options */ -typedef struct s526GPCTConfig { +struct s526GPCTConfig { enum S526_GPCT_APP_CLASS app; int data[MAX_GPCT_CONFIG_DATA]; -} s526_gpct_config_t; +}; /* * Board descriptions for two imaginary boards. Describing the @@ -201,7 +201,7 @@ struct s526_private { /* Used for AO readback */ unsigned int ao_readback[2]; - s526_gpct_config_t s526_gpct_config[4]; + struct s526GPCTConfig s526_gpct_config[4]; unsigned short s526_ai_config; };