diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:57:58 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:57:58 -0800 |
| commit | fa40ddf73c5d6c5c57fc6e79833ec48eb99cbf52 (patch) | |
| tree | 977559221fb383bdcf337df9a52d6998eaa4f70f /drivers | |
| parent | f225dbdca9127536b7296778b3b0cfd96f65df00 (diff) | |
| parent | 25dcb75878cd3b685a70c688758a4d3726e92703 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/goldfish/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/Makefile b/drivers/platform/goldfish/Makefile index e53ae2fc717b..277a820ee4e1 100644 --- a/drivers/platform/goldfish/Makefile +++ b/drivers/platform/goldfish/Makefile @@ -2,4 +2,5 @@ # Makefile for Goldfish platform specific drivers # obj-$(CONFIG_GOLDFISH_BUS) += pdev_bus.o -obj-$(CONFIG_GOLDFISH_PIPE) += goldfish_pipe.o goldfish_pipe_v2.o +obj-$(CONFIG_GOLDFISH_PIPE) += goldfish_pipe_all.o +goldfish_pipe_all-objs := goldfish_pipe.o goldfish_pipe_v2.o |