aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYoann Padioleau <padator@wanadoo.fr>2007-06-01 03:46:36 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 11:18:28 -0400
commitf8343685643f2901fe11aa9d0358cafbeaf7b4c3 (patch)
tree08cad541c6668d0372aa5c394792735dfdb06f30 /drivers
parent632155e659449685b719995d7e7081cff7b01aba (diff)
parse errors in ifdefs
Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: Jan Kara <jack@ucw.cz> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/ppchameleonevb.c4
-rw-r--r--drivers/net/fec_8xx/fec_main.c2
-rw-r--r--drivers/scsi/NCR5380.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c
index 38fe9e998ee5..082073acf20f 100644
--- a/drivers/mtd/nand/ppchameleonevb.c
+++ b/drivers/mtd/nand/ppchameleonevb.c
@@ -424,9 +424,9 @@ static void __exit ppchameleonevb_cleanup(void)
424 424
425 /* Release iomaps */ 425 /* Release iomaps */
426 this = (struct nand_chip *) &ppchameleon_mtd[1]; 426 this = (struct nand_chip *) &ppchameleon_mtd[1];
427 iounmap((void *) this->IO_ADDR_R; 427 iounmap((void *) this->IO_ADDR_R);
428 this = (struct nand_chip *) &ppchameleonevb_mtd[1]; 428 this = (struct nand_chip *) &ppchameleonevb_mtd[1];
429 iounmap((void *) this->IO_ADDR_R; 429 iounmap((void *) this->IO_ADDR_R);
430 430
431 /* Free the MTD device structure */ 431 /* Free the MTD device structure */
432 kfree (ppchameleon_mtd); 432 kfree (ppchameleon_mtd);
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 88efe9731bab..e5502af5b8e2 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -550,7 +550,7 @@ static int fec_enet_rx_common(struct net_device *dev, int *budget)
550 skbn = dev_alloc_skb(pkt_len + 2); 550 skbn = dev_alloc_skb(pkt_len + 2);
551 if (skbn != NULL) { 551 if (skbn != NULL) {
552 skb_reserve(skbn, 2); /* align IP header */ 552 skb_reserve(skbn, 2); /* align IP header */
553 skb_copy_from_linear_data(skb 553 skb_copy_from_linear_data(skb,
554 skbn->data, 554 skbn->data,
555 pkt_len); 555 pkt_len);
556 /* swap */ 556 /* swap */
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index bb3cb3360541..88ea5a1fb606 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2625,7 +2625,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
2625#ifdef REAL_DMA 2625#ifdef REAL_DMA
2626static void NCR5380_dma_complete(NCR5380_instance * instance) { 2626static void NCR5380_dma_complete(NCR5380_instance * instance) {
2627 NCR5380_local_declare(); 2627 NCR5380_local_declare();
2628 struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata); 2628 struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
2629 int transferred; 2629 int transferred;
2630 NCR5380_setup(instance); 2630 NCR5380_setup(instance);
2631 2631