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/olpc_dcon.h | |
| parent | c2e323290f9f7cd0d8115a7e7ad4d3311e5a2aa9 (diff) | |
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/olpc_dcon.h')
| -rw-r--r-- | drivers/staging/olpc_dcon/olpc_dcon.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h index 22d976a09785..41bd1360b56e 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.h +++ b/drivers/staging/olpc_dcon/olpc_dcon.h @@ -106,12 +106,7 @@ struct dcon_gpio { irqreturn_t dcon_interrupt(int irq, void *id); -#ifdef CONFIG_FB_OLPC_DCON_1 extern struct dcon_platform_data dcon_pdata_xo_1; -#endif - -#ifdef CONFIG_FB_OLPC_DCON_1_5 extern struct dcon_platform_data dcon_pdata_xo_1_5; -#endif #endif |