Skip to content

Commit

Permalink
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/nferre/linux-at91 into next/cleanup

Pull "Third batch of cleanup/SoC for 3.19" from Nicolas Ferre:

- fixes following legacy board removal
- removal of legacy board support for at91sam9263, at91sam9260/at91sam9g20
  and at91sam9261/at91sam9g10 SoCs families. Please use DT now.
- removal of some now useless Kconfig options

* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/Kconfig: remove useless fbdev Kconfig options
  ARM: at91: remove at91sam9261/at91sam9g10 legacy board support
  ARM: at91/Kconfig: remove unused config options
  ARM: at91: remove at91sam9260/at91sam9g20 legacy board support
  ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files
  ARM: at91: remove at91sam9263 legacy board support
  ARM: at91/at91sam9g45: remove useless header file

Conflicts:
	arch/arm/mach-at91/at91sam9g45.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Nov 28, 2014
2 parents 81cc3f8 + 4fdfb67 commit e155aee
Show file tree
Hide file tree
Showing 30 changed files with 2 additions and 10,251 deletions.
145 changes: 0 additions & 145 deletions arch/arm/configs/at91sam9260_9g20_defconfig

This file was deleted.

147 changes: 0 additions & 147 deletions arch/arm/configs/at91sam9261_9g10_defconfig

This file was deleted.

Loading

0 comments on commit e155aee

Please sign in to comment.