From 81b831da74f13461627d64d6c19e3a99f81c5239 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 22 Feb 2010 05:38:38 -0800 Subject: [PATCH] --- yaml --- r: 186977 b: refs/heads/master c: 4fb6088a5cb3a77123fea1279bf2d5b16cf27648 h: refs/heads/master i: 186975: e180ac5e7f3c2f2740f1dd62216dff98bea0f3a5 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/x86_init.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9820bd5f2af5..be1aff1dfdf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b2f3f7d0fe97ad312fb572c8f8d88836ae8fb1e +refs/heads/master: 4fb6088a5cb3a77123fea1279bf2d5b16cf27648 diff --git a/trunk/arch/x86/include/asm/x86_init.h b/trunk/arch/x86/include/asm/x86_init.h index 8ef56f21f9f0..b1d62bbcae3d 100644 --- a/trunk/arch/x86/include/asm/x86_init.h +++ b/trunk/arch/x86/include/asm/x86_init.h @@ -98,13 +98,15 @@ struct x86_init_iommu { int (*iommu_init)(void); }; - /* - * struct x86_init_pci - platform specific pci init functions - * @init: platform specific pci init +/** + * struct x86_init_pci - platform specific pci init functions + * @arch_init: platform specific pci arch init call + * @init: platform specific pci subsystem init * @init_irq: platform specific pci irq init * @fixup_irqs: platform specific pci irq fixup */ struct x86_init_pci { + int (*arch_init)(void); int (*init)(void); void (*init_irq)(void); void (*fixup_irqs)(void);