diff options
author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
tree | c947fdc158e144c2d060486b65d10ee67d254039 /kernel/irq/Kconfig | |
parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
Diffstat (limited to 'kernel/irq/Kconfig')
-rw-r--r-- | kernel/irq/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index cf1a4a68ce4..d1a758bc972 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -62,7 +62,7 @@ config IRQ_DOMAIN_DEBUG help This option will show the mapping relationship between hardware irq numbers and Linux irq numbers. The mapping is exposed via debugfs - in the file "virq_mapping". + in the file "irq_domain_mapping". If you don't know what this means you don't need it. |