xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel-stable' into devel

Browse Source 
Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/setup.c
	arch/arm/mm/init.c
This commit is contained in:
Russell King
2010-07-31 14:20:16 +01:00
parent ceb0885d3b a20df564d1
commit 7b70c4275f
247 changed files with 13791 additions and 3504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/mach/pci.h
View File

@@ -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 */
};
/*