diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:11:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 14:11:54 -0700 |
| commit | 55a320308902f7a0746569ee57eeb3f254e6ed16 (patch) | |
| tree | 43c86db843ede6a0c2aeeb147bad78bc209514cc /arch/powerpc/configs/pseries_defconfig | |
| parent | 18a06efae5b37bf5cb7473b5ba91a50907a8f7ac (diff) | |
| parent | d4886bc670a5ab1b74bd0a87a64344d18af206c3 (diff) | |
Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6
Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely.
That code had been moved into generic irqdomain code, but still had
powerpc-specific code and could only be enabled on powerpc.
* 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6:
irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename
irqdomain: Remove powerpc dependency from debugfs file
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 30e7d0d20e4..6608232663c 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -340,7 +340,7 @@ CONFIG_FTR_FIXUP_SELFTEST=y CONFIG_MSI_BITMAP_SELFTEST=y CONFIG_XMON=y CONFIG_XMON_DEFAULT=y -CONFIG_VIRQ_DEBUG=y +CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_CCM=m |