aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorClaudio Mignanti <c.mignanti@gmail.com>2010-07-12 13:19:57 +0000
committerClaudio Mignanti <c.mignanti@gmail.com>2010-07-12 13:19:57 +0000
commitf89d76bff4941a1c47fa40d2b8f1cf7441568ae1 (patch)
tree9e9fad5360c72a353c325044c7c9ec6cc60c73e7 /target
parent29910ddb5f224bc1d0604427f4db39c677e5129a (diff)
downloadupstream-f89d76bff4941a1c47fa40d2b8f1cf7441568ae1.tar.gz
upstream-f89d76bff4941a1c47fa40d2b8f1cf7441568ae1.tar.bz2
upstream-f89d76bff4941a1c47fa40d2b8f1cf7441568ae1.zip
[kernel] pwm: use coherent naming to avoid conflicts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22142 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/files/drivers/pwm/Makefile2
-rw-r--r--target/linux/generic/files/drivers/pwm/gpio-pwm.c (renamed from target/linux/generic/files/drivers/pwm/gpio.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/files/drivers/pwm/Makefile b/target/linux/generic/files/drivers/pwm/Makefile
index e8cacc5740..1c0e98e357 100644
--- a/target/linux/generic/files/drivers/pwm/Makefile
+++ b/target/linux/generic/files/drivers/pwm/Makefile
@@ -3,4 +3,4 @@
#
obj-y := pwm.o
obj-$(CONFIG_ATMEL_PWM) += atmel-pwm.o
-obj-$(CONFIG_GPIO_PWM) += gpio.o
+obj-$(CONFIG_GPIO_PWM) += gpio-pwm.o
diff --git a/target/linux/generic/files/drivers/pwm/gpio.c b/target/linux/generic/files/drivers/pwm/gpio-pwm.c
index dff5d1d627..dff5d1d627 100644
--- a/target/linux/generic/files/drivers/pwm/gpio.c
+++ b/target/linux/generic/files/drivers/pwm/gpio-pwm.c