diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/aoa/aoa-gpio.h | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
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 { | |||
34 | void (*set_headphone)(struct gpio_runtime *rt, int on); | 34 | void (*set_headphone)(struct gpio_runtime *rt, int on); |
35 | void (*set_speakers)(struct gpio_runtime *rt, int on); | 35 | void (*set_speakers)(struct gpio_runtime *rt, int on); |
36 | void (*set_lineout)(struct gpio_runtime *rt, int on); | 36 | void (*set_lineout)(struct gpio_runtime *rt, int on); |
37 | void (*set_master)(struct gpio_runtime *rt, int on); | ||
37 | 38 | ||
38 | int (*get_headphone)(struct gpio_runtime *rt); | 39 | int (*get_headphone)(struct gpio_runtime *rt); |
39 | int (*get_speakers)(struct gpio_runtime *rt); | 40 | int (*get_speakers)(struct gpio_runtime *rt); |
40 | int (*get_lineout)(struct gpio_runtime *rt); | 41 | int (*get_lineout)(struct gpio_runtime *rt); |
42 | int (*get_master)(struct gpio_runtime *rt); | ||
41 | 43 | ||
42 | void (*set_hw_reset)(struct gpio_runtime *rt, int on); | 44 | void (*set_hw_reset)(struct gpio_runtime *rt, int on); |
43 | 45 | ||