diff --git a/[refs] b/[refs]
index 98136e080bcd..b63aa6fe1540 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c4108c82f7769fcd265dc77a5bb0c6d8bcea25f
+refs/heads/master: e38018be3e7c03dd7e8f4ab0e1d55407cebbf89d
diff --git a/trunk/drivers/serial/max3107.h b/trunk/drivers/serial/max3107.h
index 72b30415f417..7ab632392502 100644
--- a/trunk/drivers/serial/max3107.h
+++ b/trunk/drivers/serial/max3107.h
@@ -368,8 +368,10 @@ struct max3107_port {
 	/* SPI device structure */
 	struct spi_device *spi;
 
+#if defined(CONFIG_GPIOLIB)
 	/* GPIO chip stucture */
 	struct gpio_chip chip;
+#endif
 
 	/* Workqueue that does all the magic */
 	struct workqueue_struct *workqueue;