Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-01-09 12:19:28 +01:00
commit 45d43f9bc0
2 changed files with 2 additions and 2 deletions

View File

@ -1327,7 +1327,7 @@ CONFIG_R8169=y
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SILAN is not set
CONFIG_NET_VENDOR_SIS=y
# CONFIG_SIS900 is not set
CONFIG_SIS900=y
CONFIG_SIS190=y
# CONFIG_SFC is not set
# CONFIG_NET_VENDOR_SMSC is not set

View File

@ -1325,7 +1325,7 @@ CONFIG_R8169=y
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SILAN is not set
CONFIG_NET_VENDOR_SIS=y
# CONFIG_SIS900 is not set
CONFIG_SIS900=y
CONFIG_SIS190=y
# CONFIG_SFC is not set
# CONFIG_NET_VENDOR_SMSC is not set