Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / utpredef.c

diff --git a/drivers/acpi/acpica/utpredef.c b/drivers/acpi/acpica/utpredef.c
index 29e449935a82e5f802a96f8e3c09d257a2bb2529..97898ed71b4b3a9a9a9e8d510b83fdbe52546a71 100644 (file)
--- a/drivers/acpi/acpica/utpredef.c
+++ b/drivers/acpi/acpica/utpredef.c
@@ -148,7 +148,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
        u32 j;
 
        if (!expected_btypes) {
-               ACPI_STRCPY(buffer, "NONE");
+               strcpy(buffer, "NONE");
                return;
        }
 
@@ -161,7 +161,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
                /* If one of the expected types, concatenate the name of this type */
 
                if (expected_btypes & this_rtype) {
-                       ACPI_STRCAT(buffer, &ut_rtype_names[i][j]);
+                       strcat(buffer, &ut_rtype_names[i][j]);
                        j = 0;  /* Use name separator from now on */
                }