diff options
| author | Robert Hodaszi <robert.hodaszi@digi.com> | 2011-06-02 14:28:56 +0200 |
|---|---|---|
| committer | Hector Palacios <hector.palacios@digi.com> | 2011-09-01 10:36:33 +0200 |
| commit | f346685892b3f72f7896c51c2f799195f677e373 (patch) | |
| tree | d3bc096dbe34f48fb48c6e2fb9727326718f85bd /drivers/pwm | |
| parent | 5ea5e14ba2919ce14bd7d8f5f6f202b04e502517 (diff) | |
merge: merged PWM releated CC9M2443 changes from 2.6.28
Signed-off-by: Robert Hodaszi <robert.hodaszi@digi.com>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/s3c24xx-pwm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pwm/s3c24xx-pwm.c b/drivers/pwm/s3c24xx-pwm.c index 22b742eab9fd..57fe954b61f8 100644 --- a/drivers/pwm/s3c24xx-pwm.c +++ b/drivers/pwm/s3c24xx-pwm.c @@ -27,8 +27,9 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/pwm.h> +#include <linux/slab.h> #include <mach/gpio.h> -#include <asm/plat-s3c24xx/pwm.h> +#include <plat/pwm.h> #include <plat/regs-timer.h> #define MAX_TIMER_COUNT 0xffff @@ -420,7 +421,7 @@ static void s3c24xx_pwm_free(struct pwm_channel *p) gpio_free(pch->gpio); } -static int __init s3c24xx_pwmc_probe(struct platform_device *pdev) +static int __devinit s3c24xx_pwmc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct s3c24xx_pwm *np = NULL; @@ -481,7 +482,7 @@ static int __init s3c24xx_pwmc_probe(struct platform_device *pdev) } spin_lock_init(&np->lock); - np->pwm.bus_id = pdev->dev.bus_id; + np->pwm.bus_id = dev_name(&pdev->dev); np->pwm.nchan = pdata->number_channels; /* Copy the external platform data to our internal structure */ |