diff options
| author |   Jerry Lin <wahahab11@gmail.com> | 2019-09-06 09:06:14 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-30 21:57:58 +0200 |
| commit | e40219d5e4b2177bfd4d885e7b64e3b236af40ac (patch) | |
| tree | c9996349d90f2ad53d616b5bbc14c292649a219d /drivers/staging/olpc_dcon/Makefile | |
| parent | staging: rtl8192u: Remove unnecessary line-breaks in function signatures (diff) | |
| download | linux-dev-e40219d5e4b2177bfd4d885e7b64e3b236af40ac.tar.xz linux-dev-e40219d5e4b2177bfd4d885e7b64e3b236af40ac.zip | |
staging: olpc_dcon: allow simultaneous XO-1 and XO-1.5 support
This patch remove model related configuration.
Since the module can decide which platform data to use itself base on
current running olpc board.
Also change module dependency from (GPIO_CS5535 || GPIO_CS5535=n)
to (GPIO_CS5535 || ACPI) because original one does not make any sense
and module only doing real work when GPIO_CS5535 or ACPI is setted.
Remove kernel configurations:
- FB_OLPC_DCON_1
- FB_OLPC_DCON_1_5
Signed-off-by: Jerry Lin <wahahab11@gmail.com>
Link: https://lore.kernel.org/r/20190906010613.GA562@compute1
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/olpc_dcon/Makefile')
| -rw-r--r-- | drivers/staging/olpc_dcon/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/olpc_dcon/Makefile b/drivers/staging/olpc_dcon/Makefile index cb1248c5c162..734b2ce26066 100644 --- a/drivers/staging/olpc_dcon/Makefile +++ b/drivers/staging/olpc_dcon/Makefile @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -olpc-dcon-objs += olpc_dcon.o -olpc-dcon-$(CONFIG_FB_OLPC_DCON_1) += olpc_dcon_xo_1.o -olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5) += olpc_dcon_xo_1_5.o +olpc-dcon-objs += olpc_dcon.o olpc_dcon_xo_1.o olpc_dcon_xo_1_5.o obj-$(CONFIG_FB_OLPC_DCON) += olpc-dcon.o |