diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 80d58c2de73070716ef67486df517a9a67c15900..f3a2efbf858be45fe5958d2d4bec6f7ccdaae4b5 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -3,8 +3,8 @@
 
 ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG
 
-obj-$(CONFIG_GPIOLIB)		+= devres.o
 obj-$(CONFIG_GPIOLIB)		+= gpiolib.o
+obj-$(CONFIG_GPIOLIB)		+= gpiolib-devres.o
 obj-$(CONFIG_GPIOLIB)		+= gpiolib-legacy.o
 obj-$(CONFIG_GPIOLIB)		+= gpiolib-devprop.o
 obj-$(CONFIG_OF_GPIO)		+= gpiolib-of.o
diff --git a/drivers/gpio/devres.c b/drivers/gpio/gpiolib-devres.c
similarity index 100%
rename from drivers/gpio/devres.c
rename to drivers/gpio/gpiolib-devres.c