diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:24:43 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:24:43 +0100 |
| commit | 2c2e5bb97544198a62e4edbf6aca5dd201979564 (patch) | |
| tree | ffb927ea311d86aeee3a0ef561d6218280c038cb /drivers/misc/pvpanic.c | |
| parent | 9b6872a123862cecd19a958f08eb9848b6a4240d (diff) | |
| parent | 6311d329e12a358a9813d2e929d26fbc5a4c73c2 (diff) | |
| download | talos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.tar.gz talos-op-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.zip | |
Merge branch 'for-5.1/hid-asus' into for-linus
Asus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi
Diffstat (limited to 'drivers/misc/pvpanic.c')
| -rw-r--r-- | drivers/misc/pvpanic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/pvpanic.c b/drivers/misc/pvpanic.c index 595ac065b401..95ff7c5a1dfb 100644 --- a/drivers/misc/pvpanic.c +++ b/drivers/misc/pvpanic.c @@ -70,8 +70,12 @@ pvpanic_walk_resources(struct acpi_resource *res, void *context) struct resource r; if (acpi_dev_resource_io(res, &r)) { +#ifdef CONFIG_HAS_IOPORT_MAP base = ioport_map(r.start, resource_size(&r)); return AE_OK; +#else + return AE_ERROR; +#endif } else if (acpi_dev_resource_memory(res, &r)) { base = ioremap(r.start, resource_size(&r)); return AE_OK; |
