From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 fe0c6a624e2265c22d70f64124c0751e2d7fa755
Date: Sun, 11 Jan 2015 00:40:39 +0100
Message-ID: <20150110234040.00B652184B@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6206020050974352300=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6206020050974352300==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  fe0c6a624e2265c22d70f64124c0751e2d7fa755 (commit)
       via  35086a2db41f8c5a44f69392c4d87880c391176e (commit)
      from  c0bf6eadf05d7f91cf52271a9b6b39a0bbca5871 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe0c6a624e2265c22d70f64124c0751e2d7fa755
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 11 00:40:08 2015 +0100

    backports: disable of_graph.

commit 35086a2db41f8c5a44f69392c4d87880c391176e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 11 00:39:35 2015 +0100

    backports: more module fixes.

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.armv5tel-ipfire-kirkwood |  8 ++++----
 config/kernel/kernel.config.armv5tel-ipfire-multi    | 10 ++++------
 lfs/backports                                        |  3 +++
 3 files changed, 11 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke=
rnel/kernel.config.armv5tel-ipfire-kirkwood
index 12ad87e..fbfc05c 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -3079,7 +3079,7 @@ CONFIG_REGULATOR_LP8755=3Dm
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-CONFIG_MEDIA_SUPPORT=3Dy
+CONFIG_MEDIA_SUPPORT=3Dm
=20
 #
 # Multimedia core support
@@ -3090,9 +3090,9 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=3Dy
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=3Dy
 CONFIG_MEDIA_CONTROLLER=3Dy
-CONFIG_VIDEO_DEV=3Dy
+CONFIG_VIDEO_DEV=3Dm
 CONFIG_VIDEO_V4L2_SUBDEV_API=3Dy
-CONFIG_VIDEO_V4L2=3Dy
+CONFIG_VIDEO_V4L2=3Dm
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=3Dm
@@ -3115,7 +3115,7 @@ CONFIG_DVB_DYNAMIC_MINORS=3Dy
 #
 # Media drivers
 #
-CONFIG_RC_CORE=3Dy
+CONFIG_RC_CORE=3Dm
 CONFIG_RC_MAP=3Dm
 CONFIG_RC_DECODERS=3Dy
 CONFIG_LIRC=3Dm
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne=
l/kernel.config.armv5tel-ipfire-multi
index bf14f5b..8249d2c 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -3330,7 +3330,7 @@ CONFIG_REGULATOR_TI_ABB=3Dy
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TWL4030=3Dy
 CONFIG_REGULATOR_VEXPRESS=3Dm
-CONFIG_MEDIA_SUPPORT=3Dy
+CONFIG_MEDIA_SUPPORT=3Dm
=20
 #
 # Multimedia core support
@@ -3341,9 +3341,9 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=3Dy
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=3Dy
 CONFIG_MEDIA_CONTROLLER=3Dy
-CONFIG_VIDEO_DEV=3Dy
+CONFIG_VIDEO_DEV=3Dm
 CONFIG_VIDEO_V4L2_SUBDEV_API=3Dy
-CONFIG_VIDEO_V4L2=3Dy
+CONFIG_VIDEO_V4L2=3Dm
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=3Dm
@@ -3366,7 +3366,7 @@ CONFIG_DVB_DYNAMIC_MINORS=3Dy
 #
 # Media drivers
 #
-CONFIG_RC_CORE=3Dy
+CONFIG_RC_CORE=3Dm
 CONFIG_RC_MAP=3Dm
 CONFIG_RC_DECODERS=3Dy
 CONFIG_LIRC=3Dm
@@ -3606,8 +3606,6 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=3Dy
 CONFIG_VIDEO_OMAP2_VOUT=3Dy
 CONFIG_VIDEO_TIMBERDALE=3Dm
 CONFIG_SOC_CAMERA=3Dm
-CONFIG_SOC_CAMERA_SCALE_CROP=3Dm
-CONFIG_SOC_CAMERA_PLATFORM=3Dm
 CONFIG_VIDEO_MX3=3Dm
 CONFIG_VIDEO_RCAR_VIN=3Dm
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
diff --git a/lfs/backports b/lfs/backports
index 6f5d79b..cd48700 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -112,6 +112,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && sed -i -e "s/.*DEBUGFS=3Dy/# & is not set/g" .config
 	cd $(DIR_APP) && sed -i -e "s/=3Dy is not set/ is not set/g" .config
=20
+	# Disable OF_GRAPH (not supported by kernel 3.14)
+	cd $(DIR_APP) && sed -i -e "s/CONFIG_OF/CONFIG_OF_IGNORE/g" include/linux/o=
f_graph.h
+
 	cd $(DIR_APP) && make $(MAKETUNING) KLIB=3D/lib/modules/$(KVER)-$(VERSUFIX)=
/ install
=20
 	# Remove vsp1 module (not mach to our platforms)


hooks/post-receive
--
IPFire 2.x development tree

--===============6206020050974352300==--