ibmvnic: Fix missing brackets in init_sub_crq_irqs

[cascardo/linux.git] / drivers / pcmcia / soc_common.h

diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 18a6df5..3f36258 100644 (file)
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -62,11 +62,13 @@ struct soc_pcmcia_socket {
                struct gpio_desc *desc;
                unsigned int    irq;
                const char      *name;
-       } stat[4];
+       } stat[6];
 #define SOC_STAT_CD            0       /* Card detect */
 #define SOC_STAT_BVD1          1       /* BATDEAD / IOSTSCHG */
 #define SOC_STAT_BVD2          2       /* BATWARN / IOSPKR */
 #define SOC_STAT_RDY           3       /* Ready / Interrupt */
+#define SOC_STAT_VS1           4       /* Voltage sense 1 */
+#define SOC_STAT_VS2           5       /* Voltage sense 2 */
 
        struct gpio_desc        *gpio_reset;
        struct gpio_desc        *gpio_bus_enable;
@@ -75,8 +77,12 @@ struct soc_pcmcia_socket {
 
        unsigned int            irq_state;
 
+#ifdef CONFIG_CPU_FREQ
+       struct notifier_block   cpufreq_nb;
+#endif
        struct timer_list       poll_timer;
        struct list_head        node;
+       void *driver_data;
 };
 
 struct skt_dev_info {
@@ -146,7 +152,7 @@ struct soc_pcmcia_timing {
 extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *);
 
 void soc_pcmcia_init_one(struct soc_pcmcia_socket *skt,
-       struct pcmcia_low_level *ops, struct device *dev);
+       const struct pcmcia_low_level *ops, struct device *dev);
 void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt);
 int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt);
 int soc_pcmcia_request_gpiods(struct soc_pcmcia_socket *skt);