diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:14 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:14 +0300 |
| commit | 7ecf13fd35feed2e888686320d378769305b8322 (patch) | |
| tree | da434962fa8b5d535c416f09d05dacce555f012f /arch/x86 | |
| parent | 375a99fd867cb6b91685708886ccf23e5dee39d4 (diff) | |
| parent | fe4a83ec07818f2243eac584488e65397699550c (diff) | |
| download | linux-7ecf13fd35feed2e888686320d378769305b8322.tar.xz | |
Merge branch 'pci/misc'
- Constify pcibus_class (Heiner Kallweit)
- Annotate pci_cache_line_size variables as __ro_after_init (Heiner
Kallweit)
- Clean up formatting of PCI accessor macros (Ilpo Järvinen)
- Remove some OLPC dead code (Kunwu Chan)
- Make pcie_bandwidth_capable() static (Ilpo Järvinen)
* pci/misc:
PCI: Make pcie_bandwidth_capable() static
x86/pci: Remove OLPC dead code
PCI: Clean up accessor macro formatting
PCI/ERR: Cleanup misleading indentation inside if conditions
PCI: Annotate pci_cache_line_size variables as __ro_after_init
PCI: Constify pcibus_class
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/olpc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index f3aab76e357a..4b18c6404363 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c @@ -154,9 +154,6 @@ static const uint32_t ehci_hdr[] = { /* dev f function 4 - devfn = 7d */ 0x0, 0x40, 0x0, 0x40a, /* CapPtr INT-D, IRQA */ 0xc8020001, 0x0, 0x0, 0x0, /* Capabilities - 40 is R/O, 44 is mask 8103 (power control) */ -#if 0 - 0x1, 0x40080000, 0x0, 0x0, /* EECP - see EHCI spec section 2.1.7 */ -#endif 0x01000001, 0x0, 0x0, 0x0, /* EECP - see EHCI spec section 2.1.7 */ 0x2020, 0x0, 0x0, 0x0, /* (EHCI page 8) 60 SBRN (R/O), 61 FLADJ (R/W), PORTWAKECAP */ |