mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
projects/ION/linux: fix merge conflict
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
13637a02f6
commit
87a67b896f
@ -913,7 +913,6 @@ CONFIG_NET_PCI=y
|
||||
# CONFIG_KSZ884X_PCI is not set
|
||||
# CONFIG_B44 is not set
|
||||
CONFIG_FORCEDETH=y
|
||||
CONFIG_FORCEDETH=m
|
||||
CONFIG_E100=y
|
||||
# CONFIG_FEALNX is not set
|
||||
# CONFIG_NATSEMI is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user