Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'release' and 'fluff' into release 



Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 299cfe38 299cfe38 9e527971

arch/ia64/kernel/acpi.c

+0 −4
Original line number Diff line number Diff line
@@ -615,8 +615,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) 
				     IOSAPIC_LEVEL);

}



EXPORT_SYMBOL(acpi_register_gsi);



void acpi_unregister_gsi(u32 gsi)

{

	if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
@@ -625,8 +623,6 @@ void acpi_unregister_gsi(u32 gsi) 
	iosapic_unregister_intr(gsi);

}



EXPORT_SYMBOL(acpi_unregister_gsi);



static int __init acpi_parse_fadt(struct acpi_table_header *table)

{

	struct acpi_table_header *fadt_header;

arch/x86/kernel/acpi/boot.c

+0 −3
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1; /* enable HT */ 
int acpi_lapic;

int acpi_ioapic;

int acpi_strict;

EXPORT_SYMBOL(acpi_strict);



u8 acpi_sci_flags __initdata;

int acpi_sci_override_gsi __initdata;
@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity) 
	return irq;

}



EXPORT_SYMBOL(acpi_register_gsi);



/*

 *  ACPI based hotplug support for CPU

 */

drivers/acpi/Kconfig

+7 −5
Original line number Diff line number Diff line
@@ -68,26 +68,28 @@ config ACPI_PROCFS 


	  Say N to delete /proc/acpi/ files that have moved to /sys/

config ACPI_PROCFS_POWER

	bool "Deprecated power /proc/acpi folders"

	bool "Deprecated power /proc/acpi directories"

	depends on PROC_FS

	default y

	---help---

	  For backwards compatibility, this option allows

          deprecated power /proc/acpi/ folders to exist, even when

          deprecated power /proc/acpi/ directories to exist, even when

          they have been replaced by functions in /sys.

          The deprecated folders (and their replacements) include:

          The deprecated directories (and their replacements) include:

	  /proc/acpi/battery/* (/sys/class/power_supply/*)

	  /proc/acpi/ac_adapter/* (sys/class/power_supply/*)

	  This option has no effect on /proc/acpi/ folders

	  This option has no effect on /proc/acpi/ directories

	  and functions, which do not yet exist in /sys



	  Say N to delete power /proc/acpi/ folders that have moved to /sys/

	  Say N to delete power /proc/acpi/ directories that have moved to /sys/



config ACPI_SYSFS_POWER

	bool "Future power /sys interface"

	select POWER_SUPPLY

	default y

	---help---

	  Say N to disable power /sys interface



config ACPI_PROC_EVENT

	bool "Deprecated /proc/acpi/event support"

	depends on PROC_FS

drivers/acpi/bay.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static ssize_t show_present(struct device *dev, 
	return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));



}

DEVICE_ATTR(present, S_IRUGO, show_present, NULL);

static DEVICE_ATTR(present, S_IRUGO, show_present, NULL);



/*

 * write_eject - write method for "eject" file in sysfs
@@ -150,7 +150,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr, 
	eject_device(bay->handle);

	return count;

}

DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);

static DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);



/**

 * is_ata - see if a device is an ata device

drivers/acpi/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event) 
	return 0;

}



EXPORT_SYMBOL(acpi_bus_receive_event);

#endif	/* CONFIG_ACPI_PROC_EVENT */



/* --------------------------------------------------------------------------