git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
boards
/
mach-ap325rxa
/
setup.c
diff --git
a/arch/sh/boards/mach-ap325rxa/setup.c
b/arch/sh/boards/mach-ap325rxa/setup.c
index de375b64e410e939a2a011d53a67ecfd97fc7d97..3da116f47f01b732112c50337e6a39183bc9a696 100644
(file)
--- a/
arch/sh/boards/mach-ap325rxa/setup.c
+++ b/
arch/sh/boards/mach-ap325rxa/setup.c
@@
-154,7
+154,7
@@
static struct platform_device nand_flash_device = {
#define PORT_DRVCRA 0xA405018A
#define PORT_DRVCRB 0xA405018C
-static void ap320_wvga_power_on(void *board_data)
+static void ap320_wvga_power_on(void *board_data
, struct fb_info *info
)
{
msleep(100);