diff --git a/config-armv7 b/config-armv7 index d165190..4f27e5c 100644 --- a/config-armv7 +++ b/config-armv7 @@ -496,5 +496,3 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_POWER_RESET_QNAP is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_COMMON_CLK_SI5351 is not set -# CONFIG_COMMON_CLK_AXI_CLKGEN is not set diff --git a/config-armv7-generic b/config-armv7-generic index 5657830..2bde9bb 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -90,6 +90,9 @@ CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_CPU_IDLE_GOV_MENU is not set # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set +# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set +# CONFIG_ARM_DT_BL_CPUFREQ is not set + CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_LSM_MMAP_MIN_ADDR=32768 @@ -445,6 +448,8 @@ CONFIG_PERF_EVENTS=y # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_AXI_CLKGEN is not set # these modules all fail with missing __bad_udelay # http://www.spinics.net/lists/arm/msg15615.html provides some background diff --git a/config-armv7-lpae b/config-armv7-lpae index b808e31..ce2f3f7 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -89,7 +89,9 @@ CONFIG_SENSORS_S3C_RAW=y CONFIG_FB_S3C_DEBUG_REGWRITE=y CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_USB_EHCI_S5P=y -CONFIG_SAMSUNG_USBPHY=y +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m CONFIG_MMC_DW=y CONFIG_MMC_DW_PLTFM=y CONFIG_MMC_DW_PCI=y diff --git a/config-armv7-tegra b/config-armv7-tegra index eb489db..3105975 100644 --- a/config-armv7-tegra +++ b/config-armv7-tegra @@ -75,8 +75,6 @@ CONFIG_NVEC_PAZ00=y CONFIG_PWM_TEGRA=m -# CONFIG_COMMON_CLK_SI5351 is not set - CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_SIZE_MBYTES=16 diff --git a/kernel.spec b/kernel.spec index de2c818..49feb9f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2290,6 +2290,9 @@ fi # ||----w | # || || %changelog +* Wed May 1 2013 Peter Robinson +- Minor ARM updates + * Wed May 01 2013 Josh Boyer - 3.10.0-0.rc0.git8.1 - Linux v3.9-5165-g5f56886