compile failure in pata_sil680.c
commit 0f436eff54f90419ac1b8accfb3e6e17c4b49a4e introduces the following compile failure on ppc (not powerpc), prep subarch. Seems that machine_is is only defined in the new powerpc arch.
drivers/ata/pata_sil680.c: In function 'sil680_init_chip':drivers/ata/pata_sil680.c:274: error: implicit declaration of function 'machine_is' drivers/ata/pata_sil680.c:274: error: 'cell' undeclared (first use in this function) drivers/ata/pata_sil680.c:274: error: (Each undeclared identifier is reported only once drivers/ata/pata_sil680.c:274: error: for each function it appears in.) make[2]: *** [drivers/ata/pata_sil680.o] Error 1
Signature · 1 line
Meelis Roos ([email protected])
Quoted 10 lines · Meelis Roos
commit
0f436eff54f90419ac1b8accfb3e6e17c4b49a4eintroduces the following compile failure on ppc (not powerpc), prep subarch. Seems thatmachine_isis only defined in the new powerpc arch.
drivers/ata/pata_sil680.c: In function 'sil680_init_chip':drivers/ata/pata_sil680.c:274: error: implicit declaration of function 'machine_is'drivers/ata/pata_sil680.c:274: error: 'cell' undeclared (first use in this function)drivers/ata/pata_sil680.c:274: error: (Each undeclared identifier is reported only oncedrivers/ata/pata_sil680.c:274: error: for each function it appears in.) make[2]: *** [drivers/ata/pata_sil680.o] Error 1
Argh. We still haven't got rid of arch/ppc...
Fix is to replace CONFIG_PPC with CONFIG_PPC_MERGE.
I'll send a patch.
Ben.