Linux v3.11-2455-g40031da
This commit is contained in:
		
							parent
							
								
									56937f61af
								
							
						
					
					
						commit
						9aa82fd6d2
					
				| @ -282,26 +282,6 @@ index 81465c2..6bd8b5a 100644 | |||||||
|  	help |  	help | ||||||
|  	  Support for Multi Core Timer controller on Exynos SoCs. |  	  Support for Multi Core Timer controller on Exynos SoCs. | ||||||
|   |   | ||||||
| diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
 |  | ||||||
| index de4d5d9..ffe9cb3 100644
 |  | ||||||
| --- a/drivers/cpufreq/Kconfig.arm
 |  | ||||||
| +++ b/drivers/cpufreq/Kconfig.arm
 |  | ||||||
| @@ -27,6 +27,7 @@ config ARM_EXYNOS_CPUFREQ
 |  | ||||||
|   |  | ||||||
|  	  If in doubt, say N. |  | ||||||
|   |  | ||||||
| +if ARM_EXYNOS_CPUFREQ
 |  | ||||||
|  config ARM_EXYNOS4210_CPUFREQ |  | ||||||
|  	def_bool CPU_EXYNOS4210 |  | ||||||
|  	help |  | ||||||
| @@ -54,6 +55,7 @@ config ARM_EXYNOS5440_CPUFREQ
 |  | ||||||
|  	  SoC. The nature of exynos5440 clock controller is |  | ||||||
|  	  different than previous exynos controllers so not using |  | ||||||
|  	  the common exynos framework. |  | ||||||
| +endif
 |  | ||||||
|   |  | ||||||
|  config ARM_HIGHBANK_CPUFREQ |  | ||||||
|  	tristate "Calxeda Highbank-based" |  | ||||||
| diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
 | diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
 | ||||||
| index 31f3adb..15454ad 100644
 | index 31f3adb..15454ad 100644
 | ||||||
| --- a/drivers/devfreq/Kconfig
 | --- a/drivers/devfreq/Kconfig
 | ||||||
|  | |||||||
| @ -85,6 +85,7 @@ CONFIG_MACH_OMAP3530_LV_SOM=y | |||||||
| CONFIG_MACH_OMAP3_TORPEDO=y | CONFIG_MACH_OMAP3_TORPEDO=y | ||||||
| CONFIG_MACH_OVERO=y | CONFIG_MACH_OVERO=y | ||||||
| CONFIG_MACH_OMAP3EVM=y | CONFIG_MACH_OMAP3EVM=y | ||||||
|  | CONFIG_NOP_USB_XCEIV=y | ||||||
| CONFIG_MACH_OMAP3517EVM=y | CONFIG_MACH_OMAP3517EVM=y | ||||||
| CONFIG_MACH_CRANEBOARD=y | CONFIG_MACH_CRANEBOARD=y | ||||||
| CONFIG_MACH_OMAP3_PANDORA=y | CONFIG_MACH_OMAP3_PANDORA=y | ||||||
| @ -547,7 +548,7 @@ CONFIG_SERIO_OLPC_APSP=m | |||||||
| CONFIG_SERIAL_XILINX_PS_UART=y | CONFIG_SERIAL_XILINX_PS_UART=y | ||||||
| CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | ||||||
| CONFIG_COMMON_CLK_AXI_CLKGEN=m | CONFIG_COMMON_CLK_AXI_CLKGEN=m | ||||||
| CONFIG_CPU_IDLE_ZYNQ=y | CONFIG_ARM_ZYNQ_CPUIDLE=y | ||||||
| CONFIG_LATTICE_ECP3_CONFIG=m | CONFIG_LATTICE_ECP3_CONFIG=m | ||||||
| CONFIG_NET_VENDOR_XILINX=y | CONFIG_NET_VENDOR_XILINX=y | ||||||
| CONFIG_XILINX_EMACLITE=m | CONFIG_XILINX_EMACLITE=m | ||||||
|  | |||||||
| @ -59,11 +59,11 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y | |||||||
| 
 | 
 | ||||||
| # highbank | # highbank | ||||||
| # 2013/04/19 - stability issues | # 2013/04/19 - stability issues | ||||||
| CONFIG_CPU_IDLE_CALXEDA=y |  | ||||||
| CONFIG_EDAC_HIGHBANK_MC=m | CONFIG_EDAC_HIGHBANK_MC=m | ||||||
| CONFIG_EDAC_HIGHBANK_L2=m | CONFIG_EDAC_HIGHBANK_L2=m | ||||||
| CONFIG_SATA_HIGHBANK=m | CONFIG_SATA_HIGHBANK=m | ||||||
| CONFIG_ARM_HIGHBANK_CPUFREQ=m | CONFIG_ARM_HIGHBANK_CPUFREQ=m | ||||||
|  | CONFIG_ARM_HIGHBANK_CPUIDLE=y | ||||||
| 
 | 
 | ||||||
| # errata | # errata | ||||||
| # v5/v6 | # v5/v6 | ||||||
|  | |||||||
| @ -66,6 +66,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y | |||||||
| CONFIG_SOC_EXYNOS5250=y | CONFIG_SOC_EXYNOS5250=y | ||||||
| CONFIG_SOC_EXYNOS5420=y | CONFIG_SOC_EXYNOS5420=y | ||||||
| CONFIG_SOC_EXYNOS5440=y | CONFIG_SOC_EXYNOS5440=y | ||||||
|  | CONFIG_ARM_EXYNOS5250_CPUFREQ=y | ||||||
|  | CONFIG_ARM_EXYNOS5440_CPUFREQ=y | ||||||
| CONFIG_ARM_EXYNOS_CPUFREQ=y | CONFIG_ARM_EXYNOS_CPUFREQ=y | ||||||
| # CONFIG_GENERIC_CPUFREQ_CPU0 is not set | # CONFIG_GENERIC_CPUFREQ_CPU0 is not set | ||||||
| CONFIG_EXYNOS_THERMAL=m | CONFIG_EXYNOS_THERMAL=m | ||||||
|  | |||||||
| @ -95,7 +95,7 @@ Summary: The Linux kernel | |||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %define rcrev 0 | %define rcrev 0 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 5 | %define gitrev 6 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| %define rpmversion 3.%{upstream_sublevel}.0 | %define rpmversion 3.%{upstream_sublevel}.0 | ||||||
| %endif | %endif | ||||||
| @ -2313,6 +2313,9 @@ fi | |||||||
| #                                    ||----w | | #                                    ||----w | | ||||||
| #                                    ||     || | #                                    ||     || | ||||||
| %changelog | %changelog | ||||||
|  | * Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git6.1 | ||||||
|  | - Linux v3.11-2455-g40031da | ||||||
|  | 
 | ||||||
| * Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git5.1 | * Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git5.1 | ||||||
| - Linux v3.11-2200-gf66c83d | - Linux v3.11-2200-gf66c83d | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user