diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 23:02:00 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 23:02:00 -0800 |
| commit | f2f91bee92c4cdec1f66d08600a57262940fe35d (patch) | |
| tree | 419b64e75be2a7472cb1a4b90c23d2604b3ec2e8 /arch/arm/mach-omap2/Kconfig | |
| parent | c381585fcc2426da35a6388fcc72a91ecd4f9add (diff) | |
| parent | 9b91bd81fa40b4765e24721d970c26ae2e1d8b0d (diff) | |
| download | blackbird-obmc-linux-f2f91bee92c4cdec1f66d08600a57262940fe35d.tar.gz blackbird-obmc-linux-f2f91bee92c4cdec1f66d08600a57262940fe35d.zip | |
Merge tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
OMAP SoC changes from Tony Lindgren:
Few SoC related improvments for omaps.
* tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF
ARM: OMAP2+: AM43x: Use gptimer as clocksource
ARM: OMAP2+: AM43x: determine features
ARM: OMAP2+: AM43x: Add ID for ES1.1
ARM: OMAP2+: AM43x: enable in default config
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index e2ce4f8366a7..40fd5c31b594 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -165,12 +165,6 @@ config SOC_TI81XX depends on ARCH_OMAP3 default y -config OMAP_PACKAGE_ZAF - bool - -config OMAP_PACKAGE_ZAC - bool - config OMAP_PACKAGE_CBC bool @@ -284,7 +278,6 @@ config MACH_NOKIA_N8X0 select MACH_NOKIA_N800 select MACH_NOKIA_N810 select MACH_NOKIA_N810_WIMAX - select OMAP_PACKAGE_ZAC config MACH_NOKIA_RX51 bool "Nokia N900 (RX-51) phone" |
