jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

projects/ION/linux: fix merge conflict

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-05-23 12:16:51 +02:00
parent 13637a02f6
commit 87a67b896f
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/ION/linux/linux.x86_64.conf
View File

@ -913,7 +913,6 @@ CONFIG_NET_PCI=y
# CONFIG_KSZ884X_PCI is not set # CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set # CONFIG_B44 is not set
CONFIG_FORCEDETH=y CONFIG_FORCEDETH=y
CONFIG_FORCEDETH=m
CONFIG_E100=y CONFIG_E100=y
# CONFIG_FEALNX is not set # CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set # CONFIG_NATSEMI is not set