From 8656a000fce8baa2822fb2aa5ec0193b7cf9b74d Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 25 Apr 2012 22:29:43 +0200 Subject: [PATCH] --- yaml --- r: 308472 b: refs/heads/master c: b4f0b74ea37789eeeabe57b7ccd5808df076c081 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/i2c/muxes/Kconfig | 4 ++-- trunk/drivers/i2c/muxes/Makefile | 4 ++-- trunk/drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} | 0 trunk/drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename trunk/drivers/i2c/muxes/{pca9541.c => i2c-mux-pca9541.c} (100%) rename trunk/drivers/i2c/muxes/{pca954x.c => i2c-mux-pca954x.c} (100%) diff --git a/[refs] b/[refs] index 0f2f2031dde5..5f48b31546ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0938643e533cc80ef0cdfdd2e260c4910d0f8bc7 +refs/heads/master: b4f0b74ea37789eeeabe57b7ccd5808df076c081 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 707163365a93..f0c3b4558381 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5104,7 +5104,7 @@ PCA9541 I2C BUS MASTER SELECTOR DRIVER M: Guenter Roeck L: linux-i2c@vger.kernel.org S: Maintained -F: drivers/i2c/muxes/pca9541.c +F: drivers/i2c/muxes/i2c-mux-pca9541.c PCA9564/PCA9665 I2C BUS DRIVER M: Wolfram Sang diff --git a/trunk/drivers/i2c/muxes/Kconfig b/trunk/drivers/i2c/muxes/Kconfig index 90b7a0163899..e14a4205e5c6 100644 --- a/trunk/drivers/i2c/muxes/Kconfig +++ b/trunk/drivers/i2c/muxes/Kconfig @@ -25,7 +25,7 @@ config I2C_MUX_PCA9541 I2C Master Selector. This driver can also be built as a module. If so, the module - will be called pca9541. + will be called i2c-mux-pca9541. config I2C_MUX_PCA954x tristate "Philips PCA954x I2C Mux/switches" @@ -35,6 +35,6 @@ config I2C_MUX_PCA954x I2C mux/switch devices. This driver can also be built as a module. If so, the module - will be called pca954x. + will be called i2c-mux-pca954x. endmenu diff --git a/trunk/drivers/i2c/muxes/Makefile b/trunk/drivers/i2c/muxes/Makefile index 4640436ea61f..0868335cff11 100644 --- a/trunk/drivers/i2c/muxes/Makefile +++ b/trunk/drivers/i2c/muxes/Makefile @@ -2,7 +2,7 @@ # Makefile for multiplexer I2C chip drivers. obj-$(CONFIG_I2C_MUX_GPIO) += gpio-i2cmux.o -obj-$(CONFIG_I2C_MUX_PCA9541) += pca9541.o -obj-$(CONFIG_I2C_MUX_PCA954x) += pca954x.o +obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-pca9541.o +obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG diff --git a/trunk/drivers/i2c/muxes/pca9541.c b/trunk/drivers/i2c/muxes/i2c-mux-pca9541.c similarity index 100% rename from trunk/drivers/i2c/muxes/pca9541.c rename to trunk/drivers/i2c/muxes/i2c-mux-pca9541.c diff --git a/trunk/drivers/i2c/muxes/pca954x.c b/trunk/drivers/i2c/muxes/i2c-mux-pca954x.c similarity index 100% rename from trunk/drivers/i2c/muxes/pca954x.c rename to trunk/drivers/i2c/muxes/i2c-mux-pca954x.c