diff options
author | Greg Kroah-Hartman <gregkh@google.com> | 2015-12-30 13:38:33 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-01-04 16:05:25 -0800 |
commit | 1e5dd1f8279a8a934b9df7adec47b944fe6b10f4 (patch) | |
tree | 7ce6b7475044071516d2c29138a06736f1a62a4d /drivers/staging/greybus/Makefile | |
parent | bc142bbb4ceba0891db6bf36cfb7be13c9a2dd72 (diff) |
greybus: arche-platform: merge arche-apb-ctrl and arche-platform
No need to have two separate arche platform drivers, that's just crazy,
so merge them both together to be only one kernel module.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Reviewed-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Tested-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Diffstat (limited to 'drivers/staging/greybus/Makefile')
-rw-r--r-- | drivers/staging/greybus/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile index b0d53f5228c0..011e87cb32cf 100644 --- a/drivers/staging/greybus/Makefile +++ b/drivers/staging/greybus/Makefile @@ -28,8 +28,7 @@ gb-light-y := light.o gb-raw-y := raw.o gb-hid-y := hid.o gb-es2-y := es2.o -gb-arche-y := arche-platform.o -gb-arche-apb-ctrl-y := arche-apb-ctrl.o +gb-arche-y := arche-platform.o arche-apb-ctrl.o gb-audio-codec-y := audio-codec.o gb-camera-y := camera.o @@ -43,7 +42,6 @@ obj-m += gb-hid.o obj-m += gb-raw.o obj-m += gb-es2.o obj-m += gb-arche.o -obj-m += gb-arche-apb-ctrl.o obj-m += gb-audio-codec.o obj-m += gb-camera.o |