Merge branches 'acpica' and 'acpi-tools'

* acpica:
  ACPICA: Fix buffer allocation issue for generic_serial_bus region accesses.

* acpi-tools:
  tools/power/acpi: Minor bugfixes
This commit is contained in:
Rafael J. Wysocki 2014-04-22 00:09:40 +02:00
commit 1efa9f95ee

View File

@ -89,15 +89,6 @@ else
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
endif 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 --- # --- ACPIDUMP BEGIN ---
vpath %.c \ vpath %.c \
@ -128,7 +119,7 @@ clean:
-rm -f $(OUTPUT)acpidump -rm -f $(OUTPUT)acpidump
install-tools: install-tools:
$(INSTALL) -d $(DESTDIR)${bindir} $(INSTALL) -d $(DESTDIR)${sbindir}
$(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir} $(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}
install-man: install-man: