git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
mpc866ads_setup.c
diff --git
a/arch/ppc/platforms/mpc866ads_setup.c
b/arch/ppc/platforms/mpc866ads_setup.c
index
e12cece
..
8a0c07e
100644
(file)
--- a/
arch/ppc/platforms/mpc866ads_setup.c
+++ b/
arch/ppc/platforms/mpc866ads_setup.c
@@
-137,7
+137,7
@@
void __init board_init(void)
iounmap(bcsr_io);
}
iounmap(bcsr_io);
}
-static void setup_fec1_ioports(
void
)
+static void setup_fec1_ioports(
struct fs_platform_info*
)
{
immap_t *immap = (immap_t *) IMAP_ADDR;
{
immap_t *immap = (immap_t *) IMAP_ADDR;
@@
-145,7
+145,7
@@
static void setup_fec1_ioports(void)
setbits16(&immap->im_ioport.iop_pddir, 0x1fff);
}
setbits16(&immap->im_ioport.iop_pddir, 0x1fff);
}
-static void setup_scc1_ioports(
void
)
+static void setup_scc1_ioports(
struct fs_platform_info*
)
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
@@
-194,7
+194,7
@@
static void setup_scc1_ioports(void)
}
}
-static void setup_smc1_ioports(
void
)
+static void setup_smc1_ioports(
struct fs_uart_platform_info*
)
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
@@
-216,7
+216,7
@@
static void setup_smc1_ioports(void)
}
}
-static void setup_smc2_ioports(
void
)
+static void setup_smc2_ioports(
struct fs_uart_platform_info*
)
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
{
immap_t *immap = (immap_t *) IMAP_ADDR;
unsigned *bcsr_io;
@@
-259,7
+259,7
@@
static void mpc866ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
/* Get pointer to Communication Processor */
cp = cpmp;
/* Get pointer to Communication Processor */
cp = cpmp;
- if(fs_no > ARRAY_SIZE(mpc8xx_enet_pdata)) {
+ if(fs_no >
=
ARRAY_SIZE(mpc8xx_enet_pdata)) {
printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return;
}
printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return;
}
@@
-305,7
+305,7
@@
static void __init mpc866ads_fixup_uart_pdata(struct platform_device *pdev,
int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */
int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */
- if ((id <
=
num) && (!pdev->dev.platform_data)) {
+ if ((id < num) && (!pdev->dev.platform_data)) {
pinfo = &mpc866_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
pinfo = &mpc866_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
@@
-361,7
+361,7
@@
int __init mpc866ads_init(void)
fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
/* No PHY interrupt line here */
fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
/* No PHY interrupt line here */
- fmpi->irq[0xf] =
-1
;
+ fmpi->irq[0xf] =
PHY_POLL
;
/* Since either of the uarts could be used as console, they need to ready */
#ifdef CONFIG_SERIAL_CPM_SMC1
/* Since either of the uarts could be used as console, they need to ready */
#ifdef CONFIG_SERIAL_CPM_SMC1
@@
-380,7
+380,7
@@
int __init mpc866ads_init(void)
fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
/* No PHY interrupt line here */
fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1;
/* No PHY interrupt line here */
- fmpi->irq[0xf] =
-1
;
+ fmpi->irq[0xf] =
PHY_POLL
;
return 0;
}
return 0;
}