From f7795bb7e4ddc64afff7c0e3b8ce95c11bc3a1cb Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Sun, 24 Jul 2011 15:13:08 -0500 Subject: [PATCH] merge to v3.0-git3 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- patches/defconfig | 9 ++++++++- patches/no_devtmps-defconfig | 9 ++++++++- patches/ref_omap2plus_defconfig | 10 +++++++++- version.sh | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/patches/defconfig b/patches/defconfig index 2ba85b905..3822d45a5 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.0-git2 Kernel Configuration +# Linux/arm 3.0.0-git3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -2830,12 +2830,14 @@ CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y CONFIG_SND_OMAP_SOC_MCBSP=y CONFIG_SND_OMAP_SOC_MCPDM=y +CONFIG_SND_OMAP_SOC_HDMI=y CONFIG_SND_OMAP_SOC_RX51=y CONFIG_SND_OMAP_SOC_OVERO=y CONFIG_SND_OMAP_SOC_OMAP3EVM=y CONFIG_SND_OMAP_SOC_AM3517EVM=y CONFIG_SND_OMAP_SOC_SDP3430=y CONFIG_SND_OMAP_SOC_SDP4430=y +CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y CONFIG_SND_OMAP_SOC_ZOOM2=y @@ -3303,6 +3305,11 @@ CONFIG_RTC_DRV_V3020=m CONFIG_UIO=m CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m + +# +# Virtio drivers +# +# CONFIG_VIRTIO_BALLOON is not set CONFIG_STAGING=y # CONFIG_VIDEO_TM6000 is not set # CONFIG_USBIP_CORE is not set diff --git a/patches/no_devtmps-defconfig b/patches/no_devtmps-defconfig index 591c0b2f4..80f411afa 100644 --- a/patches/no_devtmps-defconfig +++ b/patches/no_devtmps-defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.0-git2 Kernel Configuration +# Linux/arm 3.0.0-git3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -2829,12 +2829,14 @@ CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y CONFIG_SND_OMAP_SOC_MCBSP=y CONFIG_SND_OMAP_SOC_MCPDM=y +CONFIG_SND_OMAP_SOC_HDMI=y CONFIG_SND_OMAP_SOC_RX51=y CONFIG_SND_OMAP_SOC_OVERO=y CONFIG_SND_OMAP_SOC_OMAP3EVM=y CONFIG_SND_OMAP_SOC_AM3517EVM=y CONFIG_SND_OMAP_SOC_SDP3430=y CONFIG_SND_OMAP_SOC_SDP4430=y +CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y CONFIG_SND_OMAP_SOC_ZOOM2=y @@ -3302,6 +3304,11 @@ CONFIG_RTC_DRV_V3020=m CONFIG_UIO=m CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m + +# +# Virtio drivers +# +# CONFIG_VIRTIO_BALLOON is not set CONFIG_STAGING=y # CONFIG_VIDEO_TM6000 is not set # CONFIG_USBIP_CORE is not set diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index a2aa7cf5d..391b7fd7e 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.0-git2 Kernel Configuration +# Linux/arm 3.0.0-git3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -701,6 +701,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=y @@ -1682,6 +1684,7 @@ CONFIG_SND_OMAP_SOC_MCBSP=m # CONFIG_SND_OMAP_SOC_AM3517EVM is not set # CONFIG_SND_OMAP_SOC_SDP3430 is not set # CONFIG_SND_OMAP_SOC_SDP4430 is not set +# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m # CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE is not set # CONFIG_SND_OMAP_SOC_ZOOM2 is not set @@ -1992,6 +1995,11 @@ CONFIG_RTC_DRV_TWL4030=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set + +# +# Virtio drivers +# +# CONFIG_VIRTIO_BALLOON is not set # CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=y # CONFIG_HWSPINLOCK is not set diff --git a/version.sh b/version.sh index 3b569a0a5..3dbffc299 100644 --- a/version.sh +++ b/version.sh @@ -5,7 +5,7 @@ unset BUILD KERNEL_REL=3.0 #STABLE_PATCH=1 PRE_SNAP=v3.0 -PRE_RC=3.0-git2 +PRE_RC=3.0-git3 #RC_KERNEL=3.0 #RC_PATCH=-rc7 ABI=0 -- GitLab