diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-06-23 22:45:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-06-23 22:45:29 -0700 |
| commit | 5bb30b64cf9ae93c527deb8d1a7342d3aaeb89f3 (patch) | |
| tree | 0107a76ad7824f97340fc6cf5be073da61e94a55 /Documentation | |
| parent | 8f77e95efa77e25bd14686f483e2ed25525c37f2 (diff) | |
| parent | 6e42a42172b97e4c8ee8bdedafdf21596f86d876 (diff) | |
| download | history-5bb30b64cf9ae93c527deb8d1a7342d3aaeb89f3.tar.gz | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pci.txt | 5 | ||||
| -rw-r--r-- | Documentation/power/pci.txt | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index d30dc107ac62a1..41194763862ba8 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt @@ -166,8 +166,9 @@ count on these devices by calling pci_dev_put(). ~~~~~~~~~~~~~~~~~~~ Before you do anything with the device you've found, you need to enable it by calling pci_enable_device() which enables I/O and memory regions of -the device, assigns missing resources if needed and wakes up the device -if it was in suspended state. Please note that this function can fail. +the device, allocates an IRQ if necessary, assigns missing resources if +needed and wakes up the device if it was in suspended state. Please note +that this function can fail. If you want to use the device in bus mastering mode, call pci_set_master() which enables the bus master bit in PCI_COMMAND register and also fixes diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt index 4a15f20ced1269..972c7c74b879dc 100644 --- a/Documentation/power/pci.txt +++ b/Documentation/power/pci.txt @@ -286,11 +286,11 @@ wake event from: +------------------+ | Bit | State | +------------------+ -| 15 | D0 | -| 14 | D1 | +| 11 | D0 | +| 12 | D1 | | 13 | D2 | -| 12 | D3hot | -| 11 | D3cold | +| 14 | D3hot | +| 15 | D3cold | +------------------+ A device can use this to enable wake events: |