diff options
| author | Olof Johansson <olof@lixom.net> | 2013-09-25 21:55:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-25 21:55:46 -0700 |
| commit | ec01791d0ff7593fbca21a93167138a49bb94768 (patch) | |
| tree | 0ad8cae51d4bcd939665d0eaf1daebcfee507639 /drivers/block | |
| parent | f7df257a2cb0856aa3375316e8cc6d40c2c9cbe4 (diff) | |
| parent | fc6ad619a5d29c94e3eecefa572dc1d4fefdc240 (diff) | |
| download | lwn-ec01791d0ff7593fbca21a93167138a49bb94768.tar.gz lwn-ec01791d0ff7593fbca21a93167138a49bb94768.zip | |
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 'drivers/block')
| -rw-r--r-- | drivers/block/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index e07a5fd58ad7..e67fa16e1938 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -505,7 +505,7 @@ config VIRTIO_BLK config BLK_DEV_HD bool "Very old hard disk (MFM/RLL/IDE) driver" depends on HAVE_IDE - depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN + depends on !ARM || ARCH_RPC || BROKEN help This is a very old hard disk driver that lacks the enhanced functionality of the newer ones. |