diff options
author | Olof Johansson <olof@lixom.net> | 2013-09-26 04:55:46 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-09-26 04:55:46 (GMT) |
commit | ec01791d0ff7593fbca21a93167138a49bb94768 (patch) | |
tree | 0ad8cae51d4bcd939665d0eaf1daebcfee507639 /arch/arm/common/Makefile | |
parent | f7df257a2cb0856aa3375316e8cc6d40c2c9cbe4 (diff) | |
parent | fc6ad619a5d29c94e3eecefa572dc1d4fefdc240 (diff) | |
download | linux-fsl-qoriq-ec01791d0ff7593fbca21a93167138a49bb94768.tar.xz |
Merge tag 'del-shark-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
From Linus Walleij:
This deletes the Shark SA110-based sub-architecture from
the kernel.
* tag 'del-shark-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
video: drop code for ARCH_SHARK in cyber2000fb
input: i8042: drop dependency on ARCH_SHARK
ide: drop dependency on ARCH_SHARK
block: drop dependency on ARCH_SHARK
MAINTAINERS: delete Shark machine entry
ARM: delete mach-shark
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/common/Makefile')
-rw-r--r-- | arch/arm/common/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 8c60f47..eaa9cf4 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -6,7 +6,6 @@ obj-y += firmware.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o -obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o obj-$(CONFIG_DMABOUNCE) += dmabounce.o obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o |