diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /sound/spi | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'sound/spi')
| -rw-r--r-- | sound/spi/at73c213.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index 4c7b051f9d17..1bc56b2b94e2 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c | |||
| @@ -69,7 +69,6 @@ struct snd_at73c213 { | |||
| 69 | int irq; | 69 | int irq; |
| 70 | int period; | 70 | int period; |
| 71 | unsigned long bitrate; | 71 | unsigned long bitrate; |
| 72 | struct clk *bitclk; | ||
| 73 | struct ssc_device *ssc; | 72 | struct ssc_device *ssc; |
| 74 | struct spi_device *spi; | 73 | struct spi_device *spi; |
| 75 | u8 spi_wbuffer[2]; | 74 | u8 spi_wbuffer[2]; |