2.6.13-rc: ACPI_INTERPRETER=y, PCI=n compile error

I got the following compile error in 2.6.13-rc6-mm2, but it seems to be a problem coming from Linus' tree introduced by the
[ACPI] S3 resume: avoid kmalloc() might_sleep oops symptom
patch:

<-- snip -->

...
LD .tmp_vmlinux1
drivers/built-in.o: In function `acpi_os_allocate':
: undefined reference to `acpi_in_resume'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->

cu
Adrian

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed