diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
commit | 258753361534a40ad7180c742da813fc659e427b (patch) | |
tree | 58517f6ce46ab2c897d427b7d1bf29850be314fa /sound/soc/fsl/imx-ssi.h | |
parent | 315fba80a664e4bd928e0b85a38d26e60645b96a (diff) | |
parent | 2aff4c9ce898b9079658650c1ab33c44b100a203 (diff) |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/fsl/imx-ssi.h')
-rw-r--r-- | sound/soc/fsl/imx-ssi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h index 560c40fc9ebb..be6562365b6a 100644 --- a/sound/soc/fsl/imx-ssi.h +++ b/sound/soc/fsl/imx-ssi.h @@ -213,7 +213,6 @@ struct imx_ssi { int fiq_init; int dma_init; - int enabled; }; #endif /* _IMX_SSI_H */ |