summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/evxfregn.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-18 18:58:33 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-18 18:58:33 +0400
commit4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch)
tree8abf41a79f293832a430a9609530c24cd365466c /drivers/acpi/acpica/evxfregn.c
parent390de835b61228abf6646f2b14530edca8d7512f (diff)
parent6e4664525b1db28f8c4e1130957f70a94c19213e (diff)
downloadlinux-4ba25a496f62129a2ad8c2436ab2b402752dc66c.tar.xz
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'drivers/acpi/acpica/evxfregn.c')
-rw-r--r--drivers/acpi/acpica/evxfregn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index 96c9e5f355ae..80cecf838591 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -139,6 +139,7 @@ acpi_install_address_space_handler(acpi_handle device,
break;
default:
+
break;
}