Skip to content

Commit e694952

Browse files
committed
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]>
2 parents 4108b6c + 4297d1c commit e694952

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

arch/arm/mach-omap2/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,6 @@ config SOC_TI81XX
181181
depends on ARCH_OMAP3
182182
default y
183183

184-
config OMAP_PACKAGE_CBC
185-
bool
186-
187-
config OMAP_PACKAGE_CBB
188-
bool
189-
190-
config OMAP_PACKAGE_CUS
191-
bool
192-
193-
config OMAP_PACKAGE_CBP
194-
bool
195-
196184
comment "OMAP Legacy Platform Data Board Type"
197185
depends on ARCH_OMAP2PLUS
198186

@@ -204,12 +192,6 @@ config MACH_OMAP2_TUSB6010
204192
depends on ARCH_OMAP2 && SOC_OMAP2420
205193
default y if MACH_NOKIA_N8X0
206194

207-
config MACH_OMAP3_PANDORA
208-
bool "OMAP3 Pandora"
209-
depends on ARCH_OMAP3
210-
default y
211-
select OMAP_PACKAGE_CBB
212-
213195
config MACH_NOKIA_N810
214196
bool
215197

0 commit comments

Comments
 (0)