diff options
-rw-r--r-- | drivers/acpi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/natsemi.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
-rw-r--r-- | include/linux/cdrom.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b83389145f28..5d0e26a5c34c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -52,7 +52,7 @@ config ACPI_PROCFS | |||
52 | depends on PROC_FS | 52 | depends on PROC_FS |
53 | ---help--- | 53 | ---help--- |
54 | For backwards compatibility, this option allows | 54 | For backwards compatibility, this option allows |
55 | depricated /proc/acpi/ files to exist, even when | 55 | deprecated /proc/acpi/ files to exist, even when |
56 | they have been replaced by functions in /sys. | 56 | they have been replaced by functions in /sys. |
57 | The deprecated files (and their replacements) include: | 57 | The deprecated files (and their replacements) include: |
58 | 58 | ||
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 50e1ec67ef9c..953117152bbd 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
996 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that | 996 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that |
997 | made udelay() unreliable. | 997 | made udelay() unreliable. |
998 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is | 998 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is |
999 | depricated. | 999 | deprecated. |
1000 | */ | 1000 | */ |
1001 | #define eeprom_delay(ee_addr) readl(ee_addr) | 1001 | #define eeprom_delay(ee_addr) readl(ee_addr) |
1002 | 1002 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 3c8e3b63be07..35d0cfcf8c47 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -483,7 +483,7 @@ err_out_netdev: | |||
483 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that | 483 | a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that |
484 | made udelay() unreliable. | 484 | made udelay() unreliable. |
485 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is | 485 | The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is |
486 | depricated. | 486 | deprecated. |
487 | */ | 487 | */ |
488 | #define eeprom_delay(ee_addr) ioread32(ee_addr) | 488 | #define eeprom_delay(ee_addr) ioread32(ee_addr) |
489 | 489 | ||
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index b6e4b52350aa..c6d3e22c0624 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h | |||
@@ -76,7 +76,7 @@ | |||
76 | (struct cdrom_multisession) */ | 76 | (struct cdrom_multisession) */ |
77 | #define CDROM_GET_MCN 0x5311 /* Obtain the "Universal Product Code" | 77 | #define CDROM_GET_MCN 0x5311 /* Obtain the "Universal Product Code" |
78 | if available (struct cdrom_mcn) */ | 78 | if available (struct cdrom_mcn) */ |
79 | #define CDROM_GET_UPC CDROM_GET_MCN /* This one is depricated, | 79 | #define CDROM_GET_UPC CDROM_GET_MCN /* This one is deprecated, |
80 | but here anyway for compatibility */ | 80 | but here anyway for compatibility */ |
81 | #define CDROMRESET 0x5312 /* hard-reset the drive */ | 81 | #define CDROMRESET 0x5312 /* hard-reset the drive */ |
82 | #define CDROMVOLREAD 0x5313 /* Get the drive's volume setting | 82 | #define CDROMVOLREAD 0x5313 /* Get the drive's volume setting |
@@ -506,7 +506,7 @@ struct cdrom_generic_command | |||
506 | #define GPMODE_TO_PROTECT_PAGE 0x1d | 506 | #define GPMODE_TO_PROTECT_PAGE 0x1d |
507 | #define GPMODE_CAPABILITIES_PAGE 0x2a | 507 | #define GPMODE_CAPABILITIES_PAGE 0x2a |
508 | #define GPMODE_ALL_PAGES 0x3f | 508 | #define GPMODE_ALL_PAGES 0x3f |
509 | /* Not in Mt. Fuji, but in ATAPI 2.6 -- depricated now in favor | 509 | /* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor |
510 | * of MODE_SENSE_POWER_PAGE */ | 510 | * of MODE_SENSE_POWER_PAGE */ |
511 | #define GPMODE_CDROM_PAGE 0x0d | 511 | #define GPMODE_CDROM_PAGE 0x0d |
512 | 512 | ||