diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-07-25 21:58:48 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-25 21:58:48 +0200 |
| commit | 8407884dd9164ec18ed2afc00f56b87e36c51fcf (patch) | |
| tree | b6ea42c231d7d39f454de28a068d78ce11709770 /arch/arm/plat-samsung/pwm.c | |
| parent | sata_dwc_460ex: device tree may specify dma_channel (diff) | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| download | linux-8407884dd9164ec18ed2afc00f56b87e36c51fcf.tar.xz linux-8407884dd9164ec18ed2afc00f56b87e36c51fcf.zip | |
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield
list in struct scsi_device. Resolve that conflict
by including both bits.
Conflicts:
include/scsi/scsi_device.h
Diffstat (limited to 'arch/arm/plat-samsung/pwm.c')
| -rw-r--r-- | arch/arm/plat-samsung/pwm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-samsung/pwm.c b/arch/arm/plat-samsung/pwm.c index c559d8438c70..d3583050fb05 100644 --- a/arch/arm/plat-samsung/pwm.c +++ b/arch/arm/plat-samsung/pwm.c @@ -36,7 +36,6 @@ struct pwm_device { unsigned int duty_ns; unsigned char tcon_base; - unsigned char running; unsigned char use_count; unsigned char pwm_id; }; @@ -116,7 +115,6 @@ int pwm_enable(struct pwm_device *pwm) local_irq_restore(flags); - pwm->running = 1; return 0; } @@ -134,8 +132,6 @@ void pwm_disable(struct pwm_device *pwm) __raw_writel(tcon, S3C2410_TCON); local_irq_restore(flags); - - pwm->running = 0; } EXPORT_SYMBOL(pwm_disable); |