diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 22:29:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 22:29:46 +0200 |
| commit | 85ff58a3be610ca567a78c5d4e45ddd2e89088db (patch) | |
| tree | d1525398e03bf02d8c046f8d69f2ba7ba42850be /arch/arm/mach-orion5x | |
| parent | b509b5e40e0a3ce39ced2187fb3ab34d10921080 (diff) | |
| parent | 7cc5f270ee6e271df466f9d3c1c4522593002ac4 (diff) | |
| download | blackbird-op-linux-85ff58a3be610ca567a78c5d4e45ddd2e89088db.tar.gz blackbird-op-linux-85ff58a3be610ca567a78c5d4e45ddd2e89088db.zip | |
Merge tag 'at91-defconfig' of git://github.com/at91linux/linux-at91 into next/defconfig
Pull "First batch of AT91 defconfig update for 3.18" from Nicolas Ferre:
- a dependency needed for SPI flash
- enable sound on DT platforms
- cleanup of current defconfigs:
- addition of new PWM subsystem and related drivers
- addition of ADC/touchscreen, watchdog or USB depending on the SoC
- addition of power/reset drivers activated during this development cycle
- removal of obsolete config options
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-defconfig' of git://github.com/at91linux/linux-at91:
ARM: at91: sama5: update defconfig
ARM: at91: at91sam9rl: update defconfig
ARM: at91: at91sam9g45: update defconfig
ARM: at91: at91sam9263: update defconfig
ARM: at91: at91sam9261_9g10: update defconfig
ARM: at91: at91sam9260_9g20: update defconfig
ARM: at91: at91_dt: update defconfig
ARM: at91/sama5_defconfig: enable sound support
ARM: at91/at91_dt_defconfig: enable sound support
ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
Diffstat (limited to 'arch/arm/mach-orion5x')
0 files changed, 0 insertions, 0 deletions
