All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Varadarajan, Charulatha" <charu@ti.com>
To: linux-omap@vger.kernel.org
Cc: Rajendra Nayak <rnayak@ti.com>, Charulatha V <charu@ti.com>
Subject: [PATCH 1/4 RFC]OMAP2: Fix compile errors
Date: Fri, 12 Feb 2010 19:07:28 +0530	[thread overview]
Message-ID: <1265981851-11970-2-git-send-email-charu@ti.com> (raw)
In-Reply-To: <1265981851-11970-1-git-send-email-charu@ti.com>

From: Rajendra Nayak <rnayak@ti.com>

There are few compile errors for OMAP2 which are fixed by this patch

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Charulatha V <charu@ti.com>
---
 arch/arm/mach-omap2/board-2430sdp.c |    2 +-
 arch/arm/mach-omap2/serial.c        |    1 +
 arch/arm/plat-omap/i2c.c            |    2 ++
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index d6f55ef..3f45d4b 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -146,7 +146,7 @@ static void __init omap_2430sdp_init_irq(void)
 {
 	omap_board_config = sdp2430_config;
 	omap_board_config_size = ARRAY_SIZE(sdp2430_config);
-	omap2_init_common_hw(NULL, NULL);
+	omap2_init_common_hw(NULL, NULL, NULL, NULL, NULL);
 	omap_init_irq();
 	omap_gpio_init();
 }
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index e7b874f..a686948 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -570,6 +570,7 @@ DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show, sleep_timeout_store);
 #define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr))
 #else
 static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
+static void omap_uart_block_sleep(struct omap_uart_state *uart) {}
 #define DEV_CREATE_FILE(dev, attr)
 #endif /* CONFIG_PM */
 
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index fcb515d..6a617ca 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -99,6 +99,8 @@ static void omap_i2c_set_wfc_mpu_wkup_lat(struct device *dev, int val)
 {
 	omap_pm_set_max_mpu_wakeup_lat(dev, val);
 }
+#else
+static void omap_i2c_set_wfc_mpu_wkup_lat(struct device *dev, int val) {}
 #endif
 
 static void __init omap_set_i2c_constraint_func(
-- 
1.6.3.3


  reply	other threads:[~2010-02-12 13:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-12 13:37 [PATCH 0/4 RFC]OMAP:GPIO: Make GPIO an early init device Varadarajan, Charulatha
2010-02-12 13:37 ` Varadarajan, Charulatha [this message]
     [not found]   ` <1265981851-11970-3-git-send-email-charu@ti.com>
2010-02-12 13:37     ` [PATCH 3/4 RFC]OMAP:Convert GPIO into a early driver Varadarajan, Charulatha
2010-02-12 13:37       ` [PATCH 4/4 RFC]OMAP:GPIO: Convert all printk's to pr_* in gpio Varadarajan, Charulatha
2010-02-16 23:15   ` [PATCH 1/4 RFC]OMAP2: Fix compile errors Kevin Hilman
2010-03-17 15:12     ` compilation error on hwmods branch Varadarajan, Charulatha
2010-03-17 17:03       ` Tony Lindgren
2010-03-17 17:45         ` Kevin Hilman
2010-02-12 22:31 ` [PATCH 0/4 RFC]OMAP:GPIO: Make GPIO an early init device Paul Walmsley
2010-02-15  1:38   ` Paul Walmsley
2010-02-15 17:49     ` Tony Lindgren
2010-02-16 15:06       ` Varadarajan, Charulatha
2010-02-16 19:46         ` Tony Lindgren
2010-03-17 14:10           ` Varadarajan, Charulatha
2010-03-17 23:19             ` Tony Lindgren

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=1265981851-11970-2-git-send-email-charu@ti.com \
    --to=charu@ti.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=rnayak@ti.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.