linux-next: build failure after merge of the pm tree

[Stephen Rothwell]

Hi Rafael,

After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/acpi/nvs.c:15:27: fatal error: linux/acpi_io.h: No such file or 
directory
 #include <linux/acpi_io.h>
                           ^

Caused by commit a99493647c1a ("Merge branch 'acpi-cleanup' into
linux-next") which incorrectly reintroduced the include of
linux/acpi_io.h.

I have used the pm tree from next-20131217 for today.

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpS82htQHd4h.pgp
Description: PGP signature