[ACPI-sppt] acpi with XFS?

Greetings,
I'm taking my first stab at building a kernel with the acpi patches.  On 
top of that i'm using XFS as the filesystem in 2.4.x.  Unfortunately, it 
appears that the 2.4.21-rc3 acpi patches don't cleanly work with the XFS 
patches for 2.4.21(-final).  Here's what happens when i attempt to apply 
the XFS patches immediately after the acpi patches on 2.4.21:

patching file linux/Documentation/Configure.help
Hunk #3 succeeded at 20787 (offset 24 lines).
patching file linux/Documentation/filesystems/00-INDEX
...
patching file linux/MAINTAINERS
Hunk #1 succeeded at 2014 (offset 6 lines).
patching file linux/Makefile
...
patching file linux/arch/i386/config.in
Hunk #1 succeeded at 474 (offset -6 lines).
patching file linux/arch/i386/defconfig
...
patching file linux/arch/i386/kernel/io_apic.c
Hunk #1 FAILED at 28.
Hunk #2 succeeded at 602 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file 
linux/arch/i386/kernel/io_apic.c.rej
patching file linux/arch/i386/kernel/irq.c
...
patching file linux/init/main.c
Hunk #1 succeeded at 73 (offset 4 lines).
Hunk #3 succeeded at 434 (offset 4 lines).
patching file linux/kdb/ChangeLog


Obviously, i'm most concerned with the hung that failed, than with those 
that had offsets.  Any suggestions?  BTW, this is for a Sharp-MV12W 
laptop, if that matters.

thanks!

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
L. Friedman                       	       [email protected]
Linux Step-by-step & TyGeMo: 		    http://netllama.ipfox.com

   5:10pm  up 3 days, 21:54,  1 user,  load average: 0.11, 0.17, 0.15



-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php