GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source 
Conflicts:

	arch/x86/kernel/io_apic.c
This commit is contained in:
Rusty Russell 2008-12-31 23:05:57 +10:30
commit 2ca1a61583
2084 changed files with 144487 additions and 50597 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/pci.h
View file

@ -84,6 +84,8 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
static inline void early_quirks(void) { }
#endif
extern void pci_iommu_alloc(void);
#endif /* __KERNEL__ */
#ifdef CONFIG_X86_32