diff --git a/[refs] b/[refs] index 131206da3468..85efc5e42d38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c +refs/heads/master: 9e5289f4dd2326fb8c0a3af23a954158ca99c354 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 401e723e6c66..861ac378ce42 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -1433,7 +1433,7 @@ static int acpi_device_resume(struct device * dev) } -struct bus_type acpi_bus_type = { +static struct bus_type acpi_bus_type = { .name = "acpi", .suspend = acpi_device_suspend, .resume = acpi_device_resume,