Commit 8fbc1c5b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan' and 'acpi-prm' 

* acpi-scan:
  ACPI: scan: Remove unneeded header linux/nls.h

* acpi-prm:
  ACPI: PRM: Find PRMT table before parsing it
parents 22d692ba 66e0aeaa 3265cc3e

drivers/acpi/prmt.c

+9 −1
Original line number Diff line number Diff line
@@ -288,10 +288,18 @@ static acpi_status acpi_platformrt_space_handler(u32 function, 


void __init init_prmt(void)

{

	struct acpi_table_header *tbl;

	acpi_status status;

	int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) +

	int mc;



	status = acpi_get_table(ACPI_SIG_PRMT, 0, &tbl);

	if (ACPI_FAILURE(status))

		return;



	mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) +

					  sizeof (struct acpi_table_prmt_header),

					  0, acpi_parse_prmt, 0);

	acpi_put_table(tbl);

	/*

	 * Return immediately if PRMT table is not present or no PRM module found.

	 */

drivers/acpi/scan.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/signal.h>

#include <linux/kthread.h>

#include <linux/dmi.h>

#include <linux/nls.h>

#include <linux/dma-map-ops.h>

#include <linux/platform_data/x86/apple.h>

#include <linux/pgtable.h>