Re: [Resend PATCH V2 2/7] usb: Bind devices to ACPI devices when possible

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, May 04, 2012 at 05:21:55PM -0700, Greg KH wrote:

> This patch breaks the build with:
> 	ERROR: "unregister_acpi_bus_type" [drivers/usb/core/usbcore.ko] undefined!
> 	ERROR: "register_acpi_bus_type" [drivers/usb/core/usbcore.ko] undefined!
> 
> {sigh}
> 
> Care to resend them after fixing this?

Does this fix it?

commit f5c5fea66ab7db94cea5a51c474ff5111ec55800
Author: Matthew Garrett <mjg@xxxxxxxxxx>
Date:   Sat May 5 01:21:45 2012 -0400

    ACPI: Add stubs for (un)register_acpi_bus_type
    
    It's unreasonable to have CONFIG_ACPI for these in drivers, so add some
    stub functions.
    
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 30a9250..19f9483 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -431,6 +431,11 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
 }
 #endif
 
+#else	/* CONFIG_ACPI */
+
+static int register_acpi_bus_type (struct acpi_bus_type *bus) { return 0; }
+static int unregister_acpi_bus_type (struct acpi_bus_type *bus) { return 0; }
+
 #endif				/* CONFIG_ACPI */
 
 #endif /*__ACPI_BUS_H__*/

-- 
Matthew Garrett | mjg59@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux