The kernel fails to build when CONFIG_ACPI is not defined:
drivers/virtio/virtio_mmio.c:657:3: error: implicit declaration of function 'ACPI_PTR' .acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match), ^ ...
drivers/net/ethernet/smsc/smc91x.c:2412:3: error: implicit declaration of function 'ACPI_PTR' .acpi_match_table = ACPI_PTR(smc91x_acpi_match), ^ ^ This patch adds some needed ifdefs to allow !CONFIG_ACPI builds.
Signed-off-by: Mark Salter msalter@redhat.com --- drivers/net/ethernet/smsc/smc91x.c | 2 ++ drivers/virtio/virtio_mmio.c | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index b181377..3561147 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2409,7 +2409,9 @@ static struct platform_driver smc_driver = { .owner = THIS_MODULE, .pm = &smc_drv_pm_ops, .of_match_table = of_match_ptr(smc91x_match), +#ifdef CONFIG_ACPI .acpi_match_table = ACPI_PTR(smc91x_acpi_match), +#endif }, };
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 1bf6bad..e7c4db6 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -654,7 +654,9 @@ static struct platform_driver virtio_mmio_driver = { .name = "virtio-mmio", .owner = THIS_MODULE, .of_match_table = virtio_mmio_match, +#ifdef CONFIG_ACPI .acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match), +#endif }, };