diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /include/linux/pci.h | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 8621cf42b46f..bc4c40000c0d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -556,7 +556,8 @@ struct pci_dev { | |||
| 556 | /* keep track of device state */ | 556 | /* keep track of device state */ |
| 557 | unsigned int is_enabled:1; /* pci_enable_device has been called */ | 557 | unsigned int is_enabled:1; /* pci_enable_device has been called */ |
| 558 | unsigned int is_busmaster:1; /* device is busmaster */ | 558 | unsigned int is_busmaster:1; /* device is busmaster */ |
| 559 | 559 | unsigned int no_msi:1; /* device may not use msi */ | |
| 560 | |||
| 560 | u32 saved_config_space[16]; /* config space saved at suspend time */ | 561 | u32 saved_config_space[16]; /* config space saved at suspend time */ |
| 561 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ | 562 | struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ |
| 562 | int rom_attr_enabled; /* has display of the rom attribute been enabled? */ | 563 | int rom_attr_enabled; /* has display of the rom attribute been enabled? */ |