Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

[linux.git] / drivers / staging / olpc_dcon / olpc_dcon_xo_1.c

diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index a54286498a477fd2b935683f695d6e57ba8382d5..02c059897784d18fba755a61ec8e79b2438e544b 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -26,11 +26,6 @@ enum dcon_gpios {
        OLPC_DCON_BLANK,
 };
 
-struct dcon_gpio {
-       const char *name;
-       unsigned long flags;
-};
-
 static const struct dcon_gpio gpios_asis[] = {
        [OLPC_DCON_STAT0] = { .name = "dcon_stat0", .flags = GPIOD_ASIS },
        [OLPC_DCON_STAT1] = { .name = "dcon_stat1", .flags = GPIOD_ASIS },
@@ -39,7 +34,7 @@ static const struct dcon_gpio gpios_asis[] = {
        [OLPC_DCON_BLANK] = { .name = "dcon_blank", .flags = GPIOD_ASIS },
 };
 
-struct gpio_desc *gpios[5];
+static struct gpio_desc *gpios[5];
 
 static int dcon_init_xo_1(struct dcon_priv *dcon)
 {