← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/ia64/include/asm/pci.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/ia64/include/asm/pci.h
95
95
};
96
96
 
97
97
struct pci_controller {
98
 
        void *acpi_handle;
 
98
        struct acpi_device *companion;
99
99
        void *iommu;
100
100
        int segment;
101
101
        int node;               /* nearest node with memory or -1 for global allocation */