aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/fb/aty128fb.txt4
-rw-r--r--Documentation/filesystems/proc.txt2
-rw-r--r--drivers/pci/pci-driver.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/fb/aty128fb.txt b/Documentation/fb/aty128fb.txt
index 069262fb619d..b605204fcfe1 100644
--- a/Documentation/fb/aty128fb.txt
+++ b/Documentation/fb/aty128fb.txt
@@ -54,8 +54,8 @@ Accepted options:
54 54
55noaccel - do not use acceleration engine. It is default. 55noaccel - do not use acceleration engine. It is default.
56accel - use acceleration engine. Not finished. 56accel - use acceleration engine. Not finished.
57vmode:x - chooses PowerMacintosh video mode <x>. Depreciated. 57vmode:x - chooses PowerMacintosh video mode <x>. Deprecated.
58cmode:x - chooses PowerMacintosh colour mode <x>. Depreciated. 58cmode:x - chooses PowerMacintosh colour mode <x>. Deprecated.
59<XxX@X> - selects startup videomode. See modedb.txt for detailed 59<XxX@X> - selects startup videomode. See modedb.txt for detailed
60 explanation. Default is 640x480x8bpp. 60 explanation. Default is 640x480x8bpp.
61 61
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 4f3e84c520a5..8756a07f4dc3 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -229,7 +229,7 @@ Table 1-3: Kernel info in /proc
229 mounts Mounted filesystems 229 mounts Mounted filesystems
230 net Networking info (see text) 230 net Networking info (see text)
231 partitions Table of partitions known to the system 231 partitions Table of partitions known to the system
232 pci Depreciated info of PCI bus (new way -> /proc/bus/pci/, 232 pci Deprecated info of PCI bus (new way -> /proc/bus/pci/,
233 decoupled by lspci (2.4) 233 decoupled by lspci (2.4)
234 rtc Real time clock 234 rtc Real time clock
235 scsi SCSI info (see text) 235 scsi SCSI info (see text)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 3bb7739d26a5..8e58ea3d95c0 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -119,7 +119,7 @@ static inline int pci_create_newid_file(struct pci_driver *drv)
119 * system is in its list of supported devices. Returns the matching 119 * system is in its list of supported devices. Returns the matching
120 * pci_device_id structure or %NULL if there is no match. 120 * pci_device_id structure or %NULL if there is no match.
121 * 121 *
122 * Depreciated, don't use this as it will not catch any dynamic ids 122 * Deprecated, don't use this as it will not catch any dynamic ids
123 * that a driver might want to check for. 123 * that a driver might want to check for.
124 */ 124 */
125const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, 125const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,