Commit c523aef0 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and... 

Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshiba' into release
parents 160ff06b 3b34e523 c8dc9de1 b5678a34 7ce9573e 4db42c51

drivers/acpi/Kconfig

+9 −10
Original line number Diff line number Diff line
@@ -283,24 +283,23 @@ config ACPI_TOSHIBA 
	  If you have a legacy free Toshiba laptop (such as the Libretto L1

	  series), say Y.



config ACPI_CUSTOM_DSDT

	bool "Include Custom DSDT"

config ACPI_CUSTOM_DSDT_FILE

	string "Custom DSDT Table file to include"

	default ""

	depends on !STANDALONE

	default n 

	help

	  This option supports a custom DSDT by linking it into the kernel.

	  See Documentation/acpi/dsdt-override.txt



	  If unsure, say N.



config ACPI_CUSTOM_DSDT_FILE

	string "Custom DSDT Table file to include"

	depends on ACPI_CUSTOM_DSDT

	default ""

	help

	  Enter the full path name to the file which includes the AmlCode

	  declaration.



	  If unsure, don't enter a file name.



config ACPI_CUSTOM_DSDT

	bool

	default ACPI_CUSTOM_DSDT_FILE != ""



config ACPI_CUSTOM_DSDT_INITRD

	bool "Read Custom DSDT from initramfs"

	depends on BLK_DEV_INITRD

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int __init acpi_init(void) 


	acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);

	if (!acpi_kobj) {

		printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);

		printk(KERN_WARNING "%s: kset create error\n", __func__);

		acpi_kobj = NULL;

	}

drivers/acpi/button.c

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ static int acpi_button_add(struct acpi_device *device) 
	input->phys = button->phys;

	input->id.bustype = BUS_HOST;

	input->id.product = button->type;

	input->dev.parent = &device->dev;



	switch (button->type) {

	case ACPI_BUTTON_TYPE_POWER:

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ int acpi_check_resource_conflict(struct resource *res) 


	if (clash) {

		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {

			printk(KERN_INFO "%sACPI: %s resource %s [0x%llx-0x%llx]"

			printk("%sACPI: %s resource %s [0x%llx-0x%llx]"

			       " conflicts with ACPI region %s"

			       " [0x%llx-0x%llx]\n",

			       acpi_enforce_resources == ENFORCE_RESOURCES_LAX

drivers/acpi/pci_root.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void acpi_pci_bridge_scan(struct acpi_device *device) 
		}

}



static int acpi_pci_root_add(struct acpi_device *device)

static int __devinit acpi_pci_root_add(struct acpi_device *device)

{

	int result = 0;

	struct acpi_pci_root *root = NULL;