From 6c48eb1d547e9c979345737099a64755684bb385 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Fri, 23 Nov 2007 14:39:13 +0900
Subject: [PATCH] --- yaml --- r: 74087 b: refs/heads/master c:
 abac3f784f11cf8ccca0fc37ae4f5ff04cc245c4 h: refs/heads/master i:   74085:
 255e577c84fd5e9b8b7891270ee1d58835d5e4d8   74083:
 80ac76fc379f3d801bb894ed9782b32b486aa118   74079:
 8585143db642666c7339a9d310685040953bb5e5 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/sh/boards/renesas/rts7751r2d/setup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cb210fd8ac09..a4b015b60ff6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 843393d304ef4d44a8a5106e68dcd4eb1102437a
+refs/heads/master: abac3f784f11cf8ccca0fc37ae4f5ff04cc245c4
diff --git a/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c b/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
index 37f2c0b447fe..8125d20fdbd8 100644
--- a/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/trunk/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -53,10 +53,12 @@ static struct resource cf_ide_resources[] = {
 		.end	= PA_AREA5_IO + 0x80c,
 		.flags	= IORESOURCE_MEM,
 	},
+#ifndef CONFIG_RTS7751R2D_1 /* For R2D-1 polling is preferred */
 	[2] = {
 		.start	= IRQ_CF_IDE,
 		.flags	= IORESOURCE_IRQ,
 	},
+#endif
 };
 
 static struct pata_platform_info pata_info = {