When a merge does not work automatically, git prevents

[linux-2.6] / drivers / acpi / dispatcher / dswload.c

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index d2c603f54fd6856c874e4055581dbc793be42dbf..9100c0bda4701a1560e6157f33bd6d3b86757079 100644 (file)
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -983,6 +983,7 @@ acpi_ds_load2_end_op (
                                  ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
                                  walk_state, &(new_node));
                if (ACPI_SUCCESS (status)) {
+
                        /*
                         * Make sure that what we found is indeed a method
                         * We didn't search for a method on purpose, to see if the name