diff options
| author | Arnd Bergmann <[email protected]> | 2021-08-12 22:29:50 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2021-08-12 22:29:51 +0200 |
| commit | e694952772a7df091a6cffe828409843f53c9822 (patch) | |
| tree | 8d54374fe02321ff636b7a6ead5a662155c2beb5 | |
| parent | 4108b6cc7a600fe9e97ef485a2b8a60e183af465 (diff) | |
| parent | 4297d1c0834af97fe992ec7bf766f0a262ce5ffc (diff) | |
Merge tag 'omap-for-v5.15/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
Two missed SoC changes for omaps for v5.15
I managed to miss applying two out of three Kconfig changes earlier
to drop unused entries, here are the missed changes.
* tag 'omap-for-v5.15/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm: omap2: Drop the unused OMAP_PACKAGE_* KConfig entries
arm: omap2: Drop obsolete MACH_OMAP3_PANDORA entry
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index dbe7fa6e8232..7f13adf26e61 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -181,18 +181,6 @@ config SOC_TI81XX depends on ARCH_OMAP3 default y -config OMAP_PACKAGE_CBC - bool - -config OMAP_PACKAGE_CBB - bool - -config OMAP_PACKAGE_CUS - bool - -config OMAP_PACKAGE_CBP - bool - comment "OMAP Legacy Platform Data Board Type" depends on ARCH_OMAP2PLUS @@ -204,12 +192,6 @@ config MACH_OMAP2_TUSB6010 depends on ARCH_OMAP2 && SOC_OMAP2420 default y if MACH_NOKIA_N8X0 -config MACH_OMAP3_PANDORA - bool "OMAP3 Pandora" - depends on ARCH_OMAP3 - default y - select OMAP_PACKAGE_CBB - config MACH_NOKIA_N810 bool |