Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[cascardo/linux.git] / drivers / acpi / acpica / nsxfname.c

diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 83c1644..3a4bd3f 100644 (file)
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -42,7 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/export.h>
+#define EXPORT_ACPI_INTERFACES
+
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -208,7 +209,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
        ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
        status = AE_OK;
 
-      unlock_and_exit:
+unlock_and_exit:
 
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return (status);
@@ -496,7 +497,7 @@ acpi_get_object_info(acpi_handle handle,
        *return_buffer = info;
        status = AE_OK;
 
-      cleanup:
+cleanup:
        if (hid) {
                ACPI_FREE(hid);
        }