All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jarkko Nikula <jhnikula@gmail.com>
To: linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>, Felipe Balbi <balbi@ti.com>,
	Jarkko Nikula <jhnikula@gmail.com>
Subject: [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage
Date: Mon, 18 Apr 2011 22:21:32 +0300	[thread overview]
Message-ID: <1303154492-13520-3-git-send-email-jhnikula@gmail.com> (raw)
In-Reply-To: <1303154492-13520-1-git-send-email-jhnikula@gmail.com>

Fix a build breakage in CBUS initialization code in Nokia 770 and N8x0
boards that appeared after commit 0c6f8a8 "genirq: Remove compat code".

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
Build breakage that is only in linux-omap-2.6/cbus branch.
---
 arch/arm/mach-omap1/board-nokia770.c |    2 +-
 arch/arm/mach-omap2/board-n8x0.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index e2537b8..5d174a3 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -177,7 +177,7 @@ static void __init nokia770_cbus_init(void)
 		return;
 	}
 
-	set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING);
+	irq_set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING);
 	retu_resource[0].start = gpio_to_irq(62);
 	platform_device_register(&retu_device);
 
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index bd7937a..9ae6dff 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -274,7 +274,7 @@ static void __init n8x0_cbus_init(void)
 		return;
 	}
 
-	set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING);
+	irq_set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING);
 	retu_resource[0].start = gpio_to_irq(108);
 	platform_device_register(&retu_device);
 
-- 
1.7.0.4


  parent reply	other threads:[~2011-04-18 19:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
2011-04-18 19:21 ` [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Jarkko Nikula
2011-04-18 19:21 ` Jarkko Nikula [this message]
2011-04-19  7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
2011-04-19  7:53   ` Jarkko Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1303154492-13520-3-git-send-email-jhnikula@gmail.com \
    --to=jhnikula@gmail.com \
    --cc=balbi@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.