public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Sachin P. Sant" <sachinp@in.ibm.com>, Willy Tarreau <w@1wt.eu>,
	Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 6/6] Staging: panel: fix lcd panel driver build failure
Date: Mon,  9 Feb 2009 11:34:06 -0800	[thread overview]
Message-ID: <1234208046-2295-6-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090209193201.GB2194@kroah.com>

From: Sachin P. Sant <sachinp@in.ibm.com>

* Fix build break for lcd panel driver.

Signed-off-by : Sachin Sant <sachinp@in.ibm.com>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/panel/panel.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 5ffe269..ab69c1b 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -622,7 +622,7 @@ static int set_ctrl_bits(void)
 }
 
 /* sets ctrl & data port bits according to current signals values */
-static void set_bits(void)
+static void panel_set_bits(void)
 {
 	set_data_bits();
 	set_ctrl_bits();
@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte)
 	 */
 	for (bit = 0; bit < 8; bit++) {
 		bits.cl = BIT_CLR;	/* CLK low */
-		set_bits();
+		panel_set_bits();
 		bits.da = byte & 1;
-		set_bits();
+		panel_set_bits();
 		udelay(2);	/* maintain the data during 2 us before CLK up */
 		bits.cl = BIT_SET;	/* CLK high */
-		set_bits();
+		panel_set_bits();
 		udelay(1);	/* maintain the strobe during 1 us */
 		byte >>= 1;
 	}
@@ -727,7 +727,7 @@ static void lcd_backlight(int on)
 	/* The backlight is activated by seting the AUTOFEED line to +5V  */
 	spin_lock(&pprt_lock);
 	bits.bl = on;
-	set_bits();
+	panel_set_bits();
 	spin_unlock(&pprt_lock);
 }
 
-- 
1.6.0.2


      parent reply	other threads:[~2009-02-09 19:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-09 19:32 [GIT PATCH] STAGING patches for 2.6-git Greg KH
2009-02-09 19:34 ` [PATCH 1/6] Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 2/6] Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues" Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 3/6] Staging: at76_usb: Add support for OQO Model 01+ Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 4/6] Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size Greg Kroah-Hartman
2009-02-09 19:34 ` [PATCH 5/6] Staging: android: fix up units in timed_gpio Greg Kroah-Hartman
2009-02-09 19:34 ` Greg Kroah-Hartman [this message]

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=1234208046-2295-6-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sachinp@in.ibm.com \
    --cc=w@1wt.eu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox