summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/sh_mobile_lcdcfb.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-07-09 07:37:50 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-07-09 07:37:50 +0400
commit1d0df48692af1bbaced270e04b3d262810fe0e14 (patch)
tree0681b866415821dbd49f81cde66a0a154034aed9 /drivers/video/fbdev/sh_mobile_lcdcfb.h
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
parent0549252a1da98c5c39610e1700a9a1755acd0a70 (diff)
parent5d37818b9ccbec660abb3a11d4ffb0aba0e3c809 (diff)
parent8ab4abbee6df256e7afb7e90a3332aed7453d538 (diff)
parentdcfa9be83866e28fcb8b7e22b4eeb4ba63bd3174 (diff)
parent31ea5d4dfe21fb50276dcd70ce268e58d57eccb4 (diff)
downloadlinux-1d0df48692af1bbaced270e04b3d262810fe0e14.tar.xz
Merge branches 'pci/host-rcar', 'pci/hotplug', 'pci/iommu', 'pci/misc' and 'pci/msi' into next
* pci/host-rcar: PCI: rcar: Remove rcar_pcie_setup_window() resource argument PCI: rcar: Cleanup style and formatting PCI: rcar: Use correct initial HW settings PCI: rcar: Remove redundant config accessor register number checks * pci/hotplug: PCI: cpqphp: Remove unnecessary null test before debugfs_remove() PCI: pciehp: Clear Data Link Layer State Changed during init PCI: pciehp: Remove struct controller.no_cmd_complete PCI: pciehp: Remove assumptions about which commands cause completion events PCI: pciehp: Compute timeout from hotplug command start time PCI: pciehp: Wait for hotplug command completion lazily PCI: pciehp: Make pcie_wait_cmd() self-contained PCI: Prevent NULL dereference during pciehp probe * pci/iommu: PCI: Add bridge DMA alias quirk for Intel 82801 bridge * pci/misc: ACPI / PCI: Fix sysfs acpi_index and label errors PCI/portdrv: Remove warning about invalid IRQ for hot-added PCIe ports * pci/msi: PCI/MSI: Cache Multiple Message Capable in struct msi_desc PCI/MSI: Remove unused msi_enabled_mask() PCI/MSI: Add internal msix_clear_and_set_ctrl() function