[ltp] ibm-acpi 0.11 compilation problems with Fedora devel 2.6.13-rc5

[linux-thinkpad@linux-thinkpad.org]

OK, I'm not a coder, so this one has me a bit baffled... I just
installed a development kernel from Fedora (which is actually
2.6.13-rc5 with the usual Fedora patches) and ibm_acpi won't compile.
I'm using Matthias Hensler's kernel with swsusp2/fbsplash included -
and having to use his latest devel version to test for file corruption
fixes in the swsusp2/suspend2 project.

When I try to compile ibm_acpi 0.11 I get the following error:

# make
make -C /lib/modules/2.6.12-1.1446_FC4_cubbi1_swsusp2/build
SUBDIRS=/root/src/ibm-acpi-0.11 modules
make[1]: Entering directory `/usr/src/kernels/2.6.12-1.1446_FC4_cubbi1_swsusp2-i686' CC [M]  /root/src/ibm-acpi-0.11/ibm_acpi.o
/root/src/ibm-acpi-0.11/ibm_acpi.c:1756: error: conflicting types for 'device_add'
include/linux/device.h:326: error: previous declaration of 'device_add' was here
make[2]: *** [/root/src/ibm-acpi-0.11/ibm_acpi.o] Error 1

A declaration for device_add appears in both the current kernel's
include/linux/device.h and the previous kernel's (which compiled
fine) and are identical:

extern int device_add(struct device * dev);

I'm sure if I was a coder I could understand this in a minute, but
I'm not - wondering if anyone has come across this, or Borislav might
have an idea?  I bet I'll kick myself when I find out...

Honey