diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 22:27:15 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 22:27:15 +0400 |
| commit | 6c9d16178870315846faa1f59697b801e3fe0531 (patch) | |
| tree | 93ae3e2324ad116677a3bbe938c77f2cc09aeb5f /drivers | |
| parent | 6d12e796981254677a30366dd16b0a59bda2d898 (diff) | |
| parent | 971dc9ce106110745f246337f229013589354536 (diff) | |
| download | linux-6c9d16178870315846faa1f59697b801e3fe0531.tar.xz | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Merge "First AT91 fixes batch for 3.16" from Nicolas Ferre:
- drivers/misc fix for Kconfig PWM symbol
- correction of several values in DT after conversion to CCF
- fix at91sam9261/at91sam9261ek mistake in slow crystal vs. slow RC osc
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: sam9261: remove slow RC osc
ARM: at91/dt: define sam9261ek slow crystal frequency
ARM: at91/dt: sam9261: correctly define mainck
ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values
ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values
misc: atmel_pwm: fix Kconfig symbols
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index a43d0c467274..ee9402324a23 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -54,7 +54,7 @@ config AD525X_DPOT_SPI config ATMEL_PWM tristate "Atmel AT32/AT91 PWM support" depends on HAVE_CLK - depends on AVR32 || AT91SAM9263 || AT91SAM9RL || AT91SAM9G45 + depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 help This option enables device driver support for the PWM channels on certain Atmel processors. Pulse Width Modulation is used for |