diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2008-10-17 02:17:42 (GMT) |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 16:50:55 (GMT) |
| commit | ce1fc742f9703eeda0787b449ac57a780585bc97 (patch) | |
| tree | 700ad6f897ed3d3b2c6b2af5761fdda10302c6fe /arch/ia64/kernel/paravirt.c | |
| parent | 749da7912e1270abbbaef04112a7a78febf3f0f4 (diff) | |
| download | linux-ce1fc742f9703eeda0787b449ac57a780585bc97.tar.xz | |
ia64/pv_ops: avoid name conflict of get_irq_chip().
The macro get_irq_chip() is defined in linux/include/linux/irq.h
which cause name conflict with one in linux/arch/ia64/include/asm/paravirt.h.
rename the latter to __get_irq_chip().
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/paravirt.c')
| -rw-r--r-- | arch/ia64/kernel/paravirt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/paravirt.c b/arch/ia64/kernel/paravirt.c index afaf5b9..de35d8e 100644 --- a/arch/ia64/kernel/paravirt.c +++ b/arch/ia64/kernel/paravirt.c @@ -332,7 +332,7 @@ ia64_native_iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val) struct pv_iosapic_ops pv_iosapic_ops = { .pcat_compat_init = ia64_native_iosapic_pcat_compat_init, - .get_irq_chip = ia64_native_iosapic_get_irq_chip, + .__get_irq_chip = ia64_native_iosapic_get_irq_chip, .__read = ia64_native_iosapic_read, .__write = ia64_native_iosapic_write, |