Skip to content

Commit

Permalink
Merge branches 'acpica' and 'acpi-tools'
Browse files Browse the repository at this point in the history
* acpica:
  ACPICA: Fix buffer allocation issue for generic_serial_bus region accesses.

* acpi-tools:
  tools/power/acpi: Minor bugfixes
  • Loading branch information
Rafael J. Wysocki committed Apr 21, 2014
2 parents 6273f00 + 75e4f20 commit 1efa9f9
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions tools/power/acpi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@ else
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif

# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
CFLAGS += -O1 -g -DDEBUG
STRIPCMD = /bin/true -Since_we_are_debugging
else
CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif

# --- ACPIDUMP BEGIN ---

vpath %.c \
Expand Down Expand Up @@ -128,7 +119,7 @@ clean:
-rm -f $(OUTPUT)acpidump

install-tools:
$(INSTALL) -d $(DESTDIR)${bindir}
$(INSTALL) -d $(DESTDIR)${sbindir}
$(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}

install-man:
Expand Down

0 comments on commit 1efa9f9

Please sign in to comment.