diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:51 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:51 +0100 |
| commit | ff4fc3656e489ed6ee575959b0510286aefe1e20 (patch) | |
| tree | bd68ee19f3e9ab1ed825be901fb7a010d439ca9b /sound/aoa/aoa-gpio.h | |
| parent | e0d2054fd3cf167395390dc1758644486c782707 (diff) | |
| parent | 5f17e79cdf530b1a6090c65730e5656ac9c19eaa (diff) | |
Merge branch 'topic/aoa' into for-linus
Diffstat (limited to 'sound/aoa/aoa-gpio.h')
| -rw-r--r-- | sound/aoa/aoa-gpio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/aoa/aoa-gpio.h b/sound/aoa/aoa-gpio.h index ee64f5de8966..6065b0344e23 100644 --- a/sound/aoa/aoa-gpio.h +++ b/sound/aoa/aoa-gpio.h @@ -34,10 +34,12 @@ struct gpio_methods { void (*set_headphone)(struct gpio_runtime *rt, int on); void (*set_speakers)(struct gpio_runtime *rt, int on); void (*set_lineout)(struct gpio_runtime *rt, int on); + void (*set_master)(struct gpio_runtime *rt, int on); int (*get_headphone)(struct gpio_runtime *rt); int (*get_speakers)(struct gpio_runtime *rt); int (*get_lineout)(struct gpio_runtime *rt); + int (*get_master)(struct gpio_runtime *rt); void (*set_hw_reset)(struct gpio_runtime *rt, int on); |