From: Jeff Garzik Date: Tue, 7 Feb 2006 06:47:12 +0000 (-0500) Subject: Merge branch 'master' X-Git-Tag: v2.6.17-rc1~1186^2~61 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb;p=linux-2.6 Merge branch 'master' --- 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb diff --cc Documentation/feature-removal-schedule.txt index 2be7148812,4d4897c8ef..b47fba58d2 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -148,9 -148,17 +148,24 @@@ Why: The 8250 serial driver now has th brother on Alchemy SOCs. The loss of features is not considered an issue. Who: Ralf Baechle + --------------------------- +What: eepro100 network driver +When: January 2007 +Why: replaced by the e100 driver +Who: Adrian Bunk ++ ++--------------------------- ++ + What: Legacy /proc/pci interface (PCI_LEGACY_PROC) + When: March 2006 + Why: deprecated since 2.5.53 in favor of lspci(8) + Who: Adrian Bunk + + --------------------------- + + What: pci_module_init(driver) + When: January 2007 + Why: Is replaced by pci_register_driver(pci_driver). + Who: Richard Knutsson and Greg Kroah-Hartman diff --cc drivers/net/wireless/ipw2200.c index 734d2cb1de,14beab4bc9..0702f0eeb7 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@@ -2461,9 -2454,9 +2461,9 @@@ static void ipw_eeprom_init_sram(struc /* If the data looks correct, then copy it to our private copy. Otherwise let the firmware know to perform the operation - on it's own + on its own. */ - if ((priv->eeprom + EEPROM_VERSION) != 0) { + if (priv->eeprom[EEPROM_VERSION] != 0) { IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n"); /* write the eeprom data to sram */