diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-03 10:37:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-03 10:37:01 +0200 |
| commit | cd3a94b5cc26d9ecff2d8579998f5a42c9212d0c (patch) | |
| tree | f3af6156c05b3da467f88388757580ccd759f1c0 /kernel | |
| parent | 5346592778d7f50381a1122b8f07e6dd7f10e697 (diff) | |
| parent | c42321c76b0ef472e3bae4bfcb0f46ab19e038ef (diff) | |
Merge branch 'irq/core' into auto-latest
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/Kconfig | 4 | ||||
| -rw-r--r-- | kernel/irq/Makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index c574f9a12c48..d1d051b38e0b 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -48,6 +48,10 @@ config IRQ_PREFLOW_FASTEOI config IRQ_EDGE_EOI_HANDLER bool +# Generic configurable interrupt chip implementation +config GENERIC_IRQ_CHIP + bool + # Support forced irq threading config IRQ_FORCED_THREADING bool diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index e7a13bd3316a..73290056cfb6 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile @@ -1,6 +1,6 @@ obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o -obj-y += generic-chip.o +obj-$(CONFIG_GENERIC_IRQ_CHIP) += generic-chip.o obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o |