diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/abx500/ab8500-codec.h | 6 | ||||
-rw-r--r-- | include/linux/of_irq.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500/ab8500-codec.h b/include/linux/mfd/abx500/ab8500-codec.h index dc6529202cd..d7079413def 100644 --- a/include/linux/mfd/abx500/ab8500-codec.h +++ b/include/linux/mfd/abx500/ab8500-codec.h | |||
@@ -23,7 +23,8 @@ enum amic_type { | |||
23 | /* Mic-biases */ | 23 | /* Mic-biases */ |
24 | enum amic_micbias { | 24 | enum amic_micbias { |
25 | AMIC_MICBIAS_VAMIC1, | 25 | AMIC_MICBIAS_VAMIC1, |
26 | AMIC_MICBIAS_VAMIC2 | 26 | AMIC_MICBIAS_VAMIC2, |
27 | AMIC_MICBIAS_UNKNOWN | ||
27 | }; | 28 | }; |
28 | 29 | ||
29 | /* Bias-voltage */ | 30 | /* Bias-voltage */ |
@@ -31,7 +32,8 @@ enum ear_cm_voltage { | |||
31 | EAR_CMV_0_95V, | 32 | EAR_CMV_0_95V, |
32 | EAR_CMV_1_10V, | 33 | EAR_CMV_1_10V, |
33 | EAR_CMV_1_27V, | 34 | EAR_CMV_1_27V, |
34 | EAR_CMV_1_58V | 35 | EAR_CMV_1_58V, |
36 | EAR_CMV_UNKNOWN | ||
35 | }; | 37 | }; |
36 | 38 | ||
37 | /* Analog microphone settings */ | 39 | /* Analog microphone settings */ |
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 1717cd935e1..b8e24112520 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h | |||
@@ -83,6 +83,11 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, | |||
83 | { | 83 | { |
84 | return 0; | 84 | return 0; |
85 | } | 85 | } |
86 | |||
87 | static inline void *of_irq_find_parent(struct device_node *child) | ||
88 | { | ||
89 | return NULL; | ||
90 | } | ||
86 | #endif /* !CONFIG_OF */ | 91 | #endif /* !CONFIG_OF */ |
87 | 92 | ||
88 | #endif /* __OF_IRQ_H */ | 93 | #endif /* __OF_IRQ_H */ |