diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-08 13:56:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-08 13:56:28 +0100 |
| commit | e88d853b0e8679b7f37555ff3fa2093d1679d9d1 (patch) | |
| tree | a7efb95e424d1ec25d8829e6d534a92f76d278c6 /include/sound | |
| parent | 39ba9ce849665d7191372f79d9b7a3ba43570f56 (diff) | |
| parent | 46fdaa3bec1bcaa36759b1f5e5e27245ae465b8f (diff) | |
Merge branch 'topic/asoc' into for-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/cs4271.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/cs4271.h b/include/sound/cs4271.h index 16f8d325d3dc..50a059e7d116 100644 --- a/include/sound/cs4271.h +++ b/include/sound/cs4271.h @@ -19,7 +19,6 @@ struct cs4271_platform_data { int gpio_nreset; /* GPIO driving Reset pin, if any */ - int gpio_disable; /* GPIO that disable serial bus, if any */ }; #endif /* __CS4271_H */ |