diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 20:18:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 20:18:53 -0400 |
commit | 3d6ee36dfb2d40c72071f68173f67c728a0e19f3 (patch) | |
tree | 262130e0f3381c3d409817fdc4abec8852f10e7c /arch/arm/common/Kconfig | |
parent | 0b381a286e5d748b1fd80095d3dd52326819742f (diff) | |
parent | 244acb1ba3777c2eb4d33ddc246cab5419656442 (diff) |
Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM update from Russell King:
"This is the final round of stuff for ARM, left until the end of the
merge window to reduce the number of conflicts. This set contains the
ARM part of David Howells UAPI changes, and a fix to the ordering of
'select' statements in ARM Kconfig files (see the appropriate commit
for why this happened - thanks to Andrew Morton for pointing out the
problem.)
I've left this as long as I dare for this window to avoid conflicts,
and I regenerated the config patch yesterday, posting it to our
mailing list for review and testing. I have several acks which
include successful test reports for it.
However, today I notice we've got new conflicts with previously unseen
code... though that conflict should be trivial (it's my changes vs a
one liner.)"
* 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm:
ARM: config: make sure that platforms are ordered by option string
ARM: config: sort select statements alphanumerically
UAPI: (Scripted) Disintegrate arch/arm/include/asm
Fix up fairly conflict in arch/arm/Kconfig (the select re-organization
vs recent addition of GENERIC_KERNEL_EXECVE)
Diffstat (limited to 'arch/arm/common/Kconfig')
-rw-r--r-- | arch/arm/common/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 283fa1d804f4..45ceeb0e93e0 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
@@ -1,15 +1,15 @@ | |||
1 | config ARM_GIC | 1 | config ARM_GIC |
2 | bool | ||
2 | select IRQ_DOMAIN | 3 | select IRQ_DOMAIN |
3 | select MULTI_IRQ_HANDLER | 4 | select MULTI_IRQ_HANDLER |
4 | bool | ||
5 | 5 | ||
6 | config GIC_NON_BANKED | 6 | config GIC_NON_BANKED |
7 | bool | 7 | bool |
8 | 8 | ||
9 | config ARM_VIC | 9 | config ARM_VIC |
10 | bool | ||
10 | select IRQ_DOMAIN | 11 | select IRQ_DOMAIN |
11 | select MULTI_IRQ_HANDLER | 12 | select MULTI_IRQ_HANDLER |
12 | bool | ||
13 | 13 | ||
14 | config ARM_VIC_NR | 14 | config ARM_VIC_NR |
15 | int | 15 | int |