[Xen-devel] [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"

[Sander Eikelenboom <linux@xxxxxxxxxxxxxx>]

Hi All,

xen stable-2.6.31/master doesn't seem to compile:


  CC [M]  drivers/watchdog/w83877f_wdt.o
  CC [M]  drivers/watchdog/w83977f_wdt.o
  CC [M]  drivers/watchdog/machzwd.o
  CC [M]  drivers/watchdog/sbc_epx_c3.o
  CC [M]  drivers/watchdog/wm8350_wdt.o
  CC [M]  drivers/watchdog/softdog.o
  CC      drivers/xen/grant-table.o
  CC      drivers/xen/features.o
  CC      drivers/xen/events.o
drivers/xen/events.c:605: error: redefinition of âxen_destroy_irqâ
/usr/src/linux-2.6-xen/arch/x86/include/asm/xen/pci.h:28: note: previous 
definition of âxen_destroy_irqâ was here
drivers/xen/events.c:637: error: redefinition of âxen_create_msi_irqâ
/usr/src/linux-2.6-xen/arch/x86/include/asm/xen/pci.h:22: note: previous 
definition of âxen_create_msi_irqâ was here
make[2]: *** [drivers/xen/events.o] Error 1
make[1]: *** [drivers/xen] Error 2
make: *** [drivers] Error 2



git show
commit eb739cf358e03cd6ab69437d2429bcc8ad57d45b
Merge: be6c421 5e20b95
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date:   Wed Mar 3 15:36:03 2010 -0800

    Merge remote branch 'stable-2.6.31/master' into xen/stable-2.6.31.x



--

Sander


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel