diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 08:23:23 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-02-24 08:23:23 +0400 |
commit | 35eb304b5cd7b49d581bda79218b8134f3b689ea (patch) | |
tree | 3d75d9ada70814161d035b2f9166fee05d257dfb /arch/microblaze/Kconfig | |
parent | ca0cc30109241f280eb871794620d7cf198bb582 (diff) | |
parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
download | linux-35eb304b5cd7b49d581bda79218b8134f3b689ea.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus
Diffstat (limited to 'arch/microblaze/Kconfig')
-rw-r--r-- | arch/microblaze/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 74f23a460ba2..c8d6efb99dbf 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -19,6 +19,7 @@ config MICROBLAZE select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP select GENERIC_CPU_DEVICES + select GENERIC_ATOMIC64 config SWAP def_bool n |