diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:41:48 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:41:57 -0800 |
| commit | 273c2279ca502267fac40bcaecb35942380c429c (patch) | |
| tree | d062ef1ef525a7a6d4904eeabe52ae6221249846 /arch/arm/configs/at91sam9260_9g20_defconfig | |
| parent | 26d5f92adf87b1267feb8727ec59c4d0c0d933be (diff) | |
| parent | e91a5555df5883bbc204b0e1f8e0489d3f7f3f2e (diff) | |
Merge tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Second cleanup pull-request for 3.14:
- a tiny fix for the recent AT91 CCF implementation
- the switch of one platform to DT with board file removal
* tag 'at91-cleanup2' of git://github.com/at91linux/linux-at91:
ARM: at91: switch Calao QIL-A9260 board to DT
clk: at91: fix pmc_clk_ids data type attriubte
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/configs/at91sam9260_9g20_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9260_9g20_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9260_9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig index 955dc480f3ee..2cd832918e9c 100644 --- a/arch/arm/configs/at91sam9260_9g20_defconfig +++ b/arch/arm/configs/at91sam9260_9g20_defconfig @@ -15,7 +15,6 @@ CONFIG_MACH_AT91SAM9260EK=y CONFIG_MACH_CAM60=y CONFIG_MACH_SAM9_L9260=y CONFIG_MACH_AFEB9260=y -CONFIG_MACH_QIL_A9260=y CONFIG_MACH_CPU9260=y CONFIG_MACH_FLEXIBITY=y CONFIG_MACH_AT91SAM9G20EK=y |