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

Conflicts:
	packages/linux/meta
	projects/ATV/linux/linux.i386.conf
	projects/ATV/options
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Fusion/options
	projects/Generic/linux/linux.i386.conf
	projects/Generic/options
	projects/Generic_OSS/linux/linux.i386.conf
	projects/Generic_OSS/options
	projects/ION/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/ION/options
	projects/Intel/linux/linux.i386.conf
	projects/Intel/linux/linux.x86_64.conf
	projects/Intel/options
	projects/Ultra/linux/linux.x86_64.conf
	projects/Ultra/options
	projects/Virtual/linux/linux.i386.conf
	projects/Virtual/linux/linux.x86_64.conf
	projects/Virtual/options
This commit is contained in:
Stephan Raue
2012-08-09 22:26:27 +02:00
161 changed files with 1189 additions and 1496 deletions

View File

@@ -170,7 +170,7 @@
# asix-ax887xx: Asix AX887xx USB LAN Driver
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035"
ADDITIONAL_DRIVERS=""
ADDITIONAL_DRIVERS="RTL8192CU"
if [ "$PVR" = yes ]; then
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS"
fi
@@ -275,7 +275,7 @@
# build and install CEC adapter support (yes / no)
CEC_SUPPORT="yes"
# build and install iSCSI support - iscsistart (yes / no)
ISCSI_SUPPORT="yes"