diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /drivers/pci | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d408a3c30426..23d3b17c8cad 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -369,7 +369,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
| 369 | 369 | ||
| 370 | /* | 370 | /* |
| 371 | * Give firmware a chance to be called, such as ACPI _PRx, _PSx | 371 | * Give firmware a chance to be called, such as ACPI _PRx, _PSx |
| 372 | * Firmware method after natice method ? | 372 | * Firmware method after native method ? |
| 373 | */ | 373 | */ |
| 374 | if (platform_pci_set_power_state) | 374 | if (platform_pci_set_power_state) |
| 375 | platform_pci_set_power_state(dev, state); | 375 | platform_pci_set_power_state(dev, state); |