diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-07 02:40:55 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-07 02:40:55 +0200 |
commit | 6d63e354af8ca57f41ab3958b30a980a0bb50ada (patch) | |
tree | dc9f17cdb53201711d80fa925721b52474b1ff94 /drivers/acpi/acpica/Makefile | |
parent | 74d33293e467df61de1b1d8b2fbe29e550dec33b (diff) | |
parent | 40913fe6ea3b733564f0b580cf6c51f5d8fa8158 (diff) | |
download | talos-obmc-linux-6d63e354af8ca57f41ab3958b30a980a0bb50ada.tar.gz talos-obmc-linux-6d63e354af8ca57f41ab3958b30a980a0bb50ada.zip |
Merge branch 'acpica' into acpi-trace
Diffstat (limited to 'drivers/acpi/acpica/Makefile')
-rw-r--r-- | drivers/acpi/acpica/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index c1a963581dc0..fedcc16b56cc 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -11,6 +11,7 @@ obj-y += acpi.o acpi-y := \ dsargs.o \ dscontrol.o \ + dsdebug.o \ dsfield.o \ dsinit.o \ dsmethod.o \ @@ -164,6 +165,7 @@ acpi-y += \ utmath.o \ utmisc.o \ utmutex.o \ + utnonansi.o \ utobject.o \ utosi.o \ utownerid.o \ |