Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / ucb1400.h

diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index d21b33c4c6ca8a5ec5a858de75a0e2537dcf6bf3..2e9ee4d1c676732503a4f65c19ea090e68ae7002 100644 (file)
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -83,15 +83,12 @@
 #define UCB_ID                 0x7e
 #define UCB_ID_1400             0x4304
 
-struct ucb1400_gpio_data {
-       int gpio_offset;
-       int (*gpio_setup)(struct device *dev, int ngpio);
-       int (*gpio_teardown)(struct device *dev, int ngpio);
-};
-
 struct ucb1400_gpio {
        struct gpio_chip        gc;
        struct snd_ac97         *ac97;
+       int                     gpio_offset;
+       int                     (*gpio_setup)(struct device *dev, int ngpio);
+       int                     (*gpio_teardown)(struct device *dev, int ngpio);
 };
 
 struct ucb1400_ts {
@@ -110,6 +107,9 @@ struct ucb1400 {
 
 struct ucb1400_pdata {
        int     irq;
+       int     gpio_offset;
+       int     (*gpio_setup)(struct device *dev, int ngpio);
+       int     (*gpio_teardown)(struct device *dev, int ngpio);
 };
 
 static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
@@ -162,10 +162,4 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
 unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
                              int adcsync);
 
-#ifdef CONFIG_GPIO_UCB1400
-void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data);
-#else
-static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {}
-#endif
-
 #endif