diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /arch/arm/common/Makefile | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'arch/arm/common/Makefile')
| -rw-r--r-- | arch/arm/common/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index e8a4e58f1b82..dc8dd0de5c0f 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_ARM_GIC) += gic.o | ||
| 6 | obj-$(CONFIG_ARM_VIC) += vic.o | ||
| 7 | obj-$(CONFIG_ICST) += icst.o | 5 | obj-$(CONFIG_ICST) += icst.o |
| 8 | obj-$(CONFIG_SA1111) += sa1111.o | 6 | obj-$(CONFIG_SA1111) += sa1111.o |
| 9 | obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o | 7 | obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o |