diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf (patch) | |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 /kernel/irq/Makefile | |
| parent | b47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6 (diff) | |
| parent | dbd1e66e04558a582e673bc4a9cd933ce0228d93 (diff) | |
Merge branch 'oprofile/core' into oprofile/x86
Conflicts:
arch/x86/oprofile/op_model_amd.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'kernel/irq/Makefile')
| -rw-r--r-- | kernel/irq/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index 7d047808419d..54329cd7b3ee 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | obj-y := handle.o manage.o spurious.o resend.o chip.o devres.o | 2 | obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o |
| 3 | obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o | 3 | obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o |
| 4 | obj-$(CONFIG_PROC_FS) += proc.o | 4 | obj-$(CONFIG_PROC_FS) += proc.o |
| 5 | obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o | 5 | obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o |
| 6 | obj-$(CONFIG_NUMA_IRQ_DESC) += numa_migrate.o | ||
| 7 | obj-$(CONFIG_PM_SLEEP) += pm.o | 6 | obj-$(CONFIG_PM_SLEEP) += pm.o |