diff options
| author | claudio <claudio@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-12 13:19:57 +0000 |
|---|---|---|
| committer | claudio <claudio@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-12 13:19:57 +0000 |
| commit | 5c39ae21ffa2cad1d0ae5cb2e18fc9b677eaccf4 (patch) | |
| tree | 9e9fad5360c72a353c325044c7c9ec6cc60c73e7 | |
| parent | 24a6afd4e71d33970b66d799594c5f9aa1c2a090 (diff) | |
[kernel] pwm: use coherent naming to avoid conflicts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22142 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/files/drivers/pwm/Makefile | 2 | ||||
| -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 e8cacc574..1c0e98e35 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 dff5d1d62..dff5d1d62 100644 --- a/target/linux/generic/files/drivers/pwm/gpio.c +++ b/target/linux/generic/files/drivers/pwm/gpio-pwm.c |