Merge bk://ppc.bkbits.net/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/char/Makefile

@@ -77,7 +77,7 @@ obj-$(CONFIG_NWBUTTON) += nwbutton.o
 obj-$(CONFIG_NWFLASH) += nwflash.o
 obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
 
-obj-$(CONFIG_WATCHDOGS)	+= watchdog/
+obj-$(CONFIG_WATCHDOG)	+= watchdog/
 obj-$(CONFIG_MWAVE) += mwave/
 obj-$(CONFIG_AGP) += agp/
 obj-$(CONFIG_DRM) += drm/

drivers/char/watchdog/Makefile

@@ -7,21 +7,21 @@
 # watchdog dies or is 'borrowed' for some reason the software watchdog
 # still gives you some cover.
 
-watchdog-$(CONFIG_PCWATCHDOG) += pcwd.o
-watchdog-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
-watchdog-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
-watchdog-$(CONFIG_IB700_WDT) += ib700wdt.o
-watchdog-$(CONFIG_MIXCOMWD) += mixcomwd.o
-watchdog-$(CONFIG_SCx200_WDT) += scx200_wdt.o
-watchdog-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
-watchdog-$(CONFIG_WDT) += wdt.o
-watchdog-$(CONFIG_WDTPCI) += wdt_pci.o
-watchdog-$(CONFIG_21285_WATCHDOG) += wdt285.o
-watchdog-$(CONFIG_977_WATCHDOG) += wdt977.o
-watchdog-$(CONFIG_I810_TCO) += i810-tco.o
-watchdog-$(CONFIG_MACHZ_WDT) += machzwd.o
-watchdog-$(CONFIG_SH_WDT) += shwdt.o
-watchdog-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-watchdog-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+obj-$(CONFIG_PCWATCHDOG) += pcwd.o
+obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
+obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
+obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
+obj-$(CONFIG_WDT) += wdt.o
+obj-$(CONFIG_WDTPCI) += wdt_pci.o
+obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
+obj-$(CONFIG_977_WATCHDOG) += wdt977.o
+obj-$(CONFIG_I810_TCO) += i810-tco.o
+obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+obj-$(CONFIG_SH_WDT) += shwdt.o
+obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 
 include $(TOPDIR)/Rules.make

drivers/ide/pci/serverworks.c

@@ -263,7 +263,7 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 	   Our code assumes we never _ever_ do this on an OSB4 */
 	   
 	if(dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4 &&
-		drive->media != ide_disk && speed >= XFER_UDMA_0)
+		drive->media == ide_disk && speed >= XFER_UDMA_0)
 			BUG();
 			
 	pci_read_config_byte(dev, drive_pci[drive->dn], &pio_timing);

drivers/net/sunbmac.c

@@ -1209,7 +1209,7 @@ static int __init bigmac_ether_init(struct net_device *dev, struct sbus_dev *qec
 				     bp->bblock_dvma);
 
 	unregister_netdev(dev);
-	kfree(dev->priv);
+	/* This also frees the co-located 'dev->priv' */
 	kfree(dev);
 	return -ENODEV;
 }