Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

This commit is contained in:
Stephan Raue 2011-08-09 14:58:38 +02:00
commit b85dc9517a

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/i386 3.0.0 Kernel Configuration
# Linux/i386 3.0.1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@ -798,7 +798,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_CS5535_MFGPT is not set
# CONFIG_HP_ILO is not set
# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
@ -1011,7 +1010,7 @@ CONFIG_R8169=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
# CONFIG_ATL1E is not set
# CONFIG_ATL1C is not set
CONFIG_ATL1C=y
# CONFIG_JME is not set
# CONFIG_STMMAC_ETH is not set
# CONFIG_PCH_GBE is not set