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
commit86f3d57a005a6cba0997c5746b72371c9d17aaa9 (patch)
tree8965dd098b311d3d098e704455df64acc2070bef /target
parent88eb1b7ad0852f892e4276ca2c0a143aaedc8669 (diff)
downloadupstream-86f3d57a005a6cba0997c5746b72371c9d17aaa9.tar.gz
upstream-86f3d57a005a6cba0997c5746b72371c9d17aaa9.tar.bz2
upstream-86f3d57a005a6cba0997c5746b72371c9d17aaa9.zip
pwm: use coherent naming to avoid conflicts
SVN-Revision: 22142
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