diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:27 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:27 (GMT) |
| commit | 81fd7e48f44637b7e677b3dc0d298126d81a2320 (patch) | |
| tree | 4466af02e3d4260e97d56fc1e2875530ae978320 /drivers/misc | |
| parent | 1f2e7a9001b34a5ffaf730417a60349fbeffff65 (diff) | |
| parent | 151edfc757babd94d8b6c64d84a9ccf8f3c53320 (diff) | |
| download | linux-81fd7e48f44637b7e677b3dc0d298126d81a2320.tar.xz | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/atmel-ssc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index b151b7c..8f59d88 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -192,7 +192,7 @@ config ICS932S401 config ATMEL_SSC tristate "Device driver for Atmel SSC peripheral" - depends on AVR32 || ARCH_AT91 + depends on HAS_IOMEM ---help--- This option enables device driver support for Atmel Synchronized Serial Communication peripheral (SSC). diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index 3c09cbb..bd90dd2 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c @@ -175,7 +175,7 @@ static int ssc_probe(struct platform_device *pdev) /* disable all interrupts */ clk_enable(ssc->clk); - ssc_writel(ssc->regs, IDR, ~0UL); + ssc_writel(ssc->regs, IDR, -1); ssc_readl(ssc->regs, SR); clk_disable(ssc->clk); |