diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:16 +0100 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /arch/arm/include/asm/mach | |
| parent | ceb0885d3b01bb2e2f18765770e212914f2864be (diff) | |
| parent | a20df564d15bd28e3df24e1c65b885bd74d23f17 (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/include/asm/mach')
| -rw-r--r-- | arch/arm/include/asm/mach/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 52f0da1e97df..16330bd0657c 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -46,6 +46,7 @@ struct pci_sys_data { /* IRQ mapping */ int (*map_irq)(struct pci_dev *, u8, u8); struct hw_pci *hw; + void *private_data; /* platform controller private data */ }; /* |