linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 4/6] ide: drop dependency on ARCH_SHARK
@ 2013-09-13 10:53 Linus Walleij
  2013-09-13 21:44 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2013-09-13 10:53 UTC (permalink / raw)
  To: linux-arm-kernel

This drops the selection of default IDE chipset for the Shark
machine as it has been deleted.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Hi David, I am seeking an ACK to take this through the ARM SoC
tree as part of the deletion of the Shark machine. Please do not
apply it to your tree.
---
 drivers/ide/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 02906ca..3f7f59c 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -197,8 +197,8 @@ comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
 	tristate "generic/default IDE chipset support"
-	depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK
-	default ARM && (ARCH_RPC || ARCH_SHARK)
+	depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC
+	default ARM && ARCH_RPC
 	help
 	  This is the generic IDE driver.  This driver attaches to the
 	  fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH 4/6] ide: drop dependency on ARCH_SHARK
  2013-09-13 10:53 [PATCH 4/6] ide: drop dependency on ARCH_SHARK Linus Walleij
@ 2013-09-13 21:44 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-09-13 21:44 UTC (permalink / raw)
  To: linux-arm-kernel

From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 13 Sep 2013 12:53:27 +0200

> This drops the selection of default IDE chipset for the Shark
> machine as it has been deleted.
> 
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Acked-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-09-13 21:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-13 10:53 [PATCH 4/6] ide: drop dependency on ARCH_SHARK Linus Walleij
2013-09-13 21:44 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).