Skip to content

Commit

Permalink
Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
Russell King committed Mar 25, 2012
3 parents 41569e3 + 5eca8f3 + 375dec9 commit aae528d
Show file tree
Hide file tree
Showing 67 changed files with 3,718 additions and 3,082 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@ config ARCH_SA1100
select ARCH_REQUIRE_GPIOLIB
select HAVE_IDE
select NEED_MACH_MEMORY_H
select SPARSE_IRQ
help
Support for StrongARM 11x0 based boards.

Expand Down
Loading

0 comments on commit aae528d

Please sign in to comment.