aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-01-27 19:39:40 -0500
committerTony Lindgren <tony@atomide.com>2011-01-27 19:39:40 -0500
commit59b479e0985f0b795d68331d6443a7f89c47768d (patch)
tree25fbfacecdbe30dfe1727ac39b1c6462a9719097
parent0e6d8cad448bde3d846961bb43db15daae94562e (diff)
omap: Start using CONFIG_SOC_OMAP
We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest are nowadays just subcategories of these. Search and replace the following: ARCH_OMAP2420 SOC_OMAP2420 ARCH_OMAP2430 SOC_OMAP2430 ARCH_OMAP3430 SOC_OMAP3430 No functional changes. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Thomas Weber <weber@corscience.de> Acked-by: Sourav Poddar <sourav.poddar@ti.com>
Diffstat
-rw-r--r--arch/arm/mach-omap2/Kconfig16
-rw-r--r--arch/arm/mach-omap2/Makefile20
-rw-r--r--arch/arm/mach-omap2/clock2xxx.h4
-rw-r--r--arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c16
-rw-r--r--arch/arm/mach-omap2/common.c4
-rw-r--r--arch/arm/mach-omap2/devices.c6
-rw-r--r--arch/arm/mach-omap2/io.c8
-rw-r--r--arch/arm/mach-omap2/mailbox.c2
-rw-r--r--arch/arm/mach-omap2/mcbsp.c4
-rw-r--r--arch/arm/mach-omap2/opp2xxx.h2
-rw-r--r--arch/arm/mach-omap2/powerdomains2xxx_data.c6
-rw-r--r--arch/arm/plat-omap/counter_32k.c4
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h10
-rw-r--r--arch/arm/plat-omap/include/plat/io.h4
-rw-r--r--arch/arm/plat-omap/include/plat/multi.h4
-rw-r--r--arch/arm/plat-omap/sram.c4
-rw-r--r--drivers/mmc/host/Kconfig2
-rw-r--r--drivers/spi/omap2_mcspi.c4
-rw-r--r--drivers/usb/musb/musb_core.c2
-rw-r--r--drivers/usb/musb/musb_core.h6
-rw-r--r--drivers/usb/musb/musbhsdma.h2
-rw-r--r--drivers/w1/masters/Kconfig2
-rw-r--r--sound/soc/omap/omap-mcbsp.c6
-rw-r--r--sound/soc/omap/omap-mcbsp.h4
24 files changed, 71 insertions, 71 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1a2cf6226a5..ae7f47d1c97 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -53,20 +53,20 @@ config ARCH_OMAP4
53comment "OMAP Core Type" 53comment "OMAP Core Type"
54 depends on ARCH_OMAP2 54 depends on ARCH_OMAP2
55 55
56config ARCH_OMAP2420 56config SOC_OMAP2420
57 bool "OMAP2420 support" 57 bool "OMAP2420 support"
58 depends on ARCH_OMAP2 58 depends on ARCH_OMAP2
59 default y 59 default y
60 select OMAP_DM_TIMER 60 select OMAP_DM_TIMER
61 select ARCH_OMAP_OTG 61 select ARCH_OMAP_OTG
62 62
63config ARCH_OMAP2430 63config SOC_OMAP2430
64 bool "OMAP2430 support" 64 bool "OMAP2430 support"
65 depends on ARCH_OMAP2 65 depends on ARCH_OMAP2
66 default y 66 default y
67 select ARCH_OMAP_OTG 67 select ARCH_OMAP_OTG
68 68
69config ARCH_OMAP3430 69config SOC_OMAP3430
70 bool "OMAP3430 support" 70 bool "OMAP3430 support"
71 depends on ARCH_OMAP3 71 depends on ARCH_OMAP3
72 default y 72 default y
@@ -106,25 +106,25 @@ config MACH_OMAP_GENERIC
106 106
107config MACH_OMAP2_TUSB6010 107config MACH_OMAP2_TUSB6010
108 bool 108 bool
109 depends on ARCH_OMAP2 && ARCH_OMAP2420 109 depends on ARCH_OMAP2 && SOC_OMAP2420
110 default y if MACH_NOKIA_N8X0 110 default y if MACH_NOKIA_N8X0
111 111
112config MACH_OMAP_H4 112config MACH_OMAP_H4
113 bool "OMAP 2420 H4 board" 113 bool "OMAP 2420 H4 board"
114 depends on ARCH_OMAP2420 114 depends on SOC_OMAP2420
115 default y 115 default y
116 select OMAP_PACKAGE_ZAF 116 select OMAP_PACKAGE_ZAF
117 select OMAP_DEBUG_DEVICES 117 select OMAP_DEBUG_DEVICES
118 118
119config MACH_OMAP_APOLLON 119config MACH_OMAP_APOLLON
120 bool "OMAP 2420 Apollon board" 120 bool "OMAP 2420 Apollon board"
121 depends on ARCH_OMAP2420 121 depends on SOC_OMAP2420
122 default y 122 default y
123 select OMAP_PACKAGE_ZAC 123 select OMAP_PACKAGE_ZAC
124 124
125config MACH_OMAP_2430SDP 125config MACH_OMAP_2430SDP
126 bool "OMAP 2430 SDP board" 126 bool "OMAP 2430 SDP board"
127 depends on ARCH_OMAP2430 127 depends on SOC_OMAP2430
128 default y 128 default y
129 select OMAP_PACKAGE_ZAC 129 select OMAP_PACKAGE_ZAC
130 130
@@ -219,7 +219,7 @@ config MACH_NOKIA_N810_WIMAX
219 219
220config MACH_NOKIA_N8X0 220config MACH_NOKIA_N8X0
221 bool "Nokia N800/N810" 221 bool "Nokia N800/N810"
222 depends on ARCH_OMAP2420 222 depends on SOC_OMAP2420
223 default y 223 default y
224 select OMAP_PACKAGE_ZAC 224 select OMAP_PACKAGE_ZAC
225 select MACH_NOKIA_N800 225 select MACH_NOKIA_N800
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 1c0c2b02d87..9eeabaf5e11 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -31,8 +31,8 @@ AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
31AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec) 31AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec)
32 32
33# Functions loaded to SRAM 33# Functions loaded to SRAM
34obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o 34obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
35obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o 35obj-$(CONFIG_SOC_OMAP2430) += sram243x.o
36obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o 36obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o
37 37
38AFLAGS_sram242x.o :=-Wa,-march=armv6 38AFLAGS_sram242x.o :=-Wa,-march=armv6
@@ -40,8 +40,8 @@ AFLAGS_sram243x.o :=-Wa,-march=armv6
40AFLAGS_sram34xx.o :=-Wa,-march=armv7-a 40AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
41 41
42# Pin multiplexing 42# Pin multiplexing
43obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o 43obj-$(CONFIG_SOC_OMAP2420) += mux2420.o
44obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o 44obj-$(CONFIG_SOC_OMAP2430) += mux2430.o
45obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o 45obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
46obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o 46obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
47 47
@@ -113,8 +113,8 @@ obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \
113 clkt2xxx_dpllcore.o \ 113 clkt2xxx_dpllcore.o \
114 clkt2xxx_virt_prcm_set.o \ 114 clkt2xxx_virt_prcm_set.o \
115 clkt2xxx_apll.o clkt2xxx_osc.o 115 clkt2xxx_apll.o clkt2xxx_osc.o
116obj-$(CONFIG_ARCH_OMAP2420) += clock2420_data.o 116obj-$(CONFIG_SOC_OMAP2420) += clock2420_data.o
117obj-$(CONFIG_ARCH_OMAP2430) += clock2430.o clock2430_data.o 117obj-$(CONFIG_SOC_OMAP2430) += clock2430.o clock2430_data.o
118obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \ 118obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \
119 clock34xx.o clkt34xx_dpll3m2.o \ 119 clock34xx.o clkt34xx_dpll3m2.o \
120 clock3517.o clock36xx.o \ 120 clock3517.o clock36xx.o \
@@ -123,12 +123,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o \
123 dpll3xxx.o 123 dpll3xxx.o
124 124
125# OMAP2 clock rate set data (old "OPP" data) 125# OMAP2 clock rate set data (old "OPP" data)
126obj-$(CONFIG_ARCH_OMAP2420) += opp2420_data.o 126obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
127obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o 127obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o
128 128
129# hwmod data 129# hwmod data
130obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o 130obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2420_data.o
131obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o 131obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o
132obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o 132obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
133obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o 133obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
134 134
diff --git a/arch/arm/mach-omap2/clock2xxx.h b/arch/arm/mach-omap2/clock2xxx.h
index 6a658b890c1..cc5c8d422c5 100644
--- a/arch/arm/mach-omap2/clock2xxx.h
+++ b/arch/arm/mach-omap2/clock2xxx.h
@@ -20,13 +20,13 @@ u32 omap2xxx_get_apll_clkin(void);
20u32 omap2xxx_get_sysclkdiv(void); 20u32 omap2xxx_get_sysclkdiv(void);
21void omap2xxx_clk_prepare_for_reboot(void); 21void omap2xxx_clk_prepare_for_reboot(void);
22 22
23#ifdef CONFIG_ARCH_OMAP2420 23#ifdef CONFIG_SOC_OMAP2420
24int omap2420_clk_init(void); 24int omap2420_clk_init(void);
25#else 25#else
26#define omap2420_clk_init() 0 26#define omap2420_clk_init() 0
27#endif 27#endif
28 28
29#ifdef CONFIG_ARCH_OMAP2430 29#ifdef CONFIG_SOC_OMAP2430
30int omap2430_clk_init(void); 30int omap2430_clk_init(void);
31#else 31#else
32#define omap2430_clk_init() 0 32#define omap2430_clk_init() 0
diff --git a/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c b/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
index e4a7133ea3b..e6f0d18d5e8 100644
--- a/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
@@ -171,7 +171,7 @@ static struct clkdm_dep core_24xx_wkdeps[] = {
171 171
172/* 2430-specific possible wakeup dependencies */ 172/* 2430-specific possible wakeup dependencies */
173 173
174#ifdef CONFIG_ARCH_OMAP2430 174#ifdef CONFIG_SOC_OMAP2430
175 175
176/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */ 176/* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */
177static struct clkdm_dep mdm_2430_wkdeps[] = { 177static struct clkdm_dep mdm_2430_wkdeps[] = {
@@ -194,7 +194,7 @@ static struct clkdm_dep mdm_2430_wkdeps[] = {
194 { NULL }, 194 { NULL },
195}; 195};
196 196
197#endif /* CONFIG_ARCH_OMAP2430 */ 197#endif /* CONFIG_SOC_OMAP2430 */
198 198
199 199
200/* OMAP3-specific possible dependencies */ 200/* OMAP3-specific possible dependencies */
@@ -450,7 +450,7 @@ static struct clockdomain cm_clkdm = {
450 * 2420-only clockdomains 450 * 2420-only clockdomains
451 */ 451 */
452 452
453#if defined(CONFIG_ARCH_OMAP2420) 453#if defined(CONFIG_SOC_OMAP2420)
454 454
455static struct clockdomain mpu_2420_clkdm = { 455static struct clockdomain mpu_2420_clkdm = {
456 .name = "mpu_clkdm", 456 .name = "mpu_clkdm",
@@ -514,14 +514,14 @@ static struct clockdomain dss_2420_clkdm = {
514 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), 514 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
515}; 515};
516 516
517#endif /* CONFIG_ARCH_OMAP2420 */ 517#endif /* CONFIG_SOC_OMAP2420 */
518 518
519 519
520/* 520/*
521 * 2430-only clockdomains 521 * 2430-only clockdomains
522 */ 522 */
523 523
524#if defined(CONFIG_ARCH_OMAP2430) 524#if defined(CONFIG_SOC_OMAP2430)
525 525
526static struct clockdomain mpu_2430_clkdm = { 526static struct clockdomain mpu_2430_clkdm = {
527 .name = "mpu_clkdm", 527 .name = "mpu_clkdm",
@@ -600,7 +600,7 @@ static struct clockdomain dss_2430_clkdm = {
600 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), 600 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
601}; 601};
602 602
603#endif /* CONFIG_ARCH_OMAP2430 */ 603#endif /* CONFIG_SOC_OMAP2430 */
604 604
605 605
606/* 606/*
@@ -811,7 +811,7 @@ static struct clockdomain *clockdomains_omap2[] __initdata = {
811 &cm_clkdm, 811 &cm_clkdm,
812 &prm_clkdm, 812 &prm_clkdm,
813 813
814#ifdef CONFIG_ARCH_OMAP2420 814#ifdef CONFIG_SOC_OMAP2420
815 &mpu_2420_clkdm, 815 &mpu_2420_clkdm,
816 &iva1_2420_clkdm, 816 &iva1_2420_clkdm,
817 &dsp_2420_clkdm, 817 &dsp_2420_clkdm,
@@ -821,7 +821,7 @@ static struct clockdomain *clockdomains_omap2[] __initdata = {
821 &dss_2420_clkdm, 821 &dss_2420_clkdm,
822#endif 822#endif
823 823
824#ifdef CONFIG_ARCH_OMAP2430 824#ifdef CONFIG_SOC_OMAP2430
825 &mpu_2430_clkdm, 825 &mpu_2430_clkdm,
826 &mdm_clkdm, 826 &mdm_clkdm,
827 &dsp_2430_clkdm, 827 &dsp_2430_clkdm,
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 778929f7e92..d5eaee3dff7 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -40,7 +40,7 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
40 40
41#endif 41#endif
42 42
43#if defined(CONFIG_ARCH_OMAP2420) 43#if defined(CONFIG_SOC_OMAP2420)
44 44
45static struct omap_globals omap242x_globals = { 45static struct omap_globals omap242x_globals = {
46 .class = OMAP242X_CLASS, 46 .class = OMAP242X_CLASS,
@@ -61,7 +61,7 @@ void __init omap2_set_globals_242x(void)
61} 61}
62#endif 62#endif
63 63
64#if defined(CONFIG_ARCH_OMAP2430) 64#if defined(CONFIG_SOC_OMAP2430)
65 65
66static struct omap_globals omap243x_globals = { 66static struct omap_globals omap243x_globals = {
67 .class = OMAP243X_CLASS, 67 .class = OMAP243X_CLASS,
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2c9c912f2c4..e0f0ef952bc 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -333,7 +333,7 @@ static struct platform_device omap2_mcspi2 = {
333 }, 333 },
334}; 334};
335 335
336#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ 336#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
337 defined(CONFIG_ARCH_OMAP4) 337 defined(CONFIG_ARCH_OMAP4)
338static struct omap2_mcspi_platform_config omap2_mcspi3_config = { 338static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
339 .num_cs = 2, 339 .num_cs = 2,
@@ -400,7 +400,7 @@ static inline void omap4_mcspi_fixup(void)
400} 400}
401#endif 401#endif
402 402
403#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ 403#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
404 defined(CONFIG_ARCH_OMAP4) 404 defined(CONFIG_ARCH_OMAP4)
405static inline void omap2_mcspi3_init(void) 405static inline void omap2_mcspi3_init(void)
406{ 406{
@@ -895,7 +895,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
895/*-------------------------------------------------------------------------*/ 895/*-------------------------------------------------------------------------*/
896 896
897#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE) 897#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
898#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) 898#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
899#define OMAP_HDQ_BASE 0x480B2000 899#define OMAP_HDQ_BASE 0x480B2000
900#endif 900#endif
901static struct resource omap_hdq_resources[] = { 901static struct resource omap_hdq_resources[] = {
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index c2032041d26..11decd85f18 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -66,7 +66,7 @@ static struct map_desc omap24xx_io_desc[] __initdata = {
66 }, 66 },
67}; 67};
68 68
69#ifdef CONFIG_ARCH_OMAP2420 69#ifdef CONFIG_SOC_OMAP2420
70static struct map_desc omap242x_io_desc[] __initdata = { 70static struct map_desc omap242x_io_desc[] __initdata = {
71 { 71 {
72 .virtual = DSP_MEM_2420_VIRT, 72 .virtual = DSP_MEM_2420_VIRT,
@@ -90,7 +90,7 @@ static struct map_desc omap242x_io_desc[] __initdata = {
90 90
91#endif 91#endif
92 92
93#ifdef CONFIG_ARCH_OMAP2430 93#ifdef CONFIG_SOC_OMAP2430
94static struct map_desc omap243x_io_desc[] __initdata = { 94static struct map_desc omap243x_io_desc[] __initdata = {
95 { 95 {
96 .virtual = L4_WK_243X_VIRT, 96 .virtual = L4_WK_243X_VIRT,
@@ -241,7 +241,7 @@ static void __init _omap2_map_common_io(void)
241 omap_sram_init(); 241 omap_sram_init();
242} 242}
243 243
244#ifdef CONFIG_ARCH_OMAP2420 244#ifdef CONFIG_SOC_OMAP2420
245void __init omap242x_map_common_io(void) 245void __init omap242x_map_common_io(void)
246{ 246{
247 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); 247 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
@@ -250,7 +250,7 @@ void __init omap242x_map_common_io(void)
250} 250}
251#endif 251#endif
252 252
253#ifdef CONFIG_ARCH_OMAP2430 253#ifdef CONFIG_SOC_OMAP2430
254void __init omap243x_map_common_io(void) 254void __init omap243x_map_common_io(void)
255{ 255{
256 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); 256 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 394413dc7de..29b9dc3917a 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -310,7 +310,7 @@ struct omap_mbox mbox_dsp_info = {
310struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL }; 310struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
311#endif 311#endif
312 312
313#if defined(CONFIG_ARCH_OMAP2420) 313#if defined(CONFIG_SOC_OMAP2420)
314/* IVA */ 314/* IVA */
315static struct omap_mbox2_priv omap2_mbox_iva_priv = { 315static struct omap_mbox2_priv omap2_mbox_iva_priv = {
316 .tx_fifo = { 316 .tx_fifo = {
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index f9c9df5b5ff..0526b758bdc 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -104,7 +104,7 @@ EXPORT_SYMBOL(omap2_mcbsp_set_clks_src);
104 104
105/* Platform data */ 105/* Platform data */
106 106
107#ifdef CONFIG_ARCH_OMAP2420 107#ifdef CONFIG_SOC_OMAP2420
108static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { 108static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
109 { 109 {
110 .phys_base = OMAP24XX_MCBSP1_BASE, 110 .phys_base = OMAP24XX_MCBSP1_BASE,
@@ -129,7 +129,7 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
129#define OMAP2420_MCBSP_REG_NUM 0 129#define OMAP2420_MCBSP_REG_NUM 0
130#endif 130#endif
131 131
132#ifdef CONFIG_ARCH_OMAP2430 132#ifdef CONFIG_SOC_OMAP2430
133static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 133static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
134 { 134 {
135 .phys_base = OMAP24XX_MCBSP1_BASE, 135 .phys_base = OMAP24XX_MCBSP1_BASE,
diff --git a/arch/arm/mach-omap2/opp2xxx.h b/arch/arm/mach-omap2/opp2xxx.h
index 38b73055050..8affc66a92c 100644
--- a/arch/arm/mach-omap2/opp2xxx.h
+++ b/arch/arm/mach-omap2/opp2xxx.h
@@ -418,7 +418,7 @@ struct prcm_config {
418 418
419extern const struct prcm_config omap2420_rate_table[]; 419extern const struct prcm_config omap2420_rate_table[];
420 420
421#ifdef CONFIG_ARCH_OMAP2430 421#ifdef CONFIG_SOC_OMAP2430
422extern const struct prcm_config omap2430_rate_table[]; 422extern const struct prcm_config omap2430_rate_table[];
423#else 423#else
424#define omap2430_rate_table NULL 424#define omap2430_rate_table NULL
diff --git a/arch/arm/mach-omap2/powerdomains2xxx_data.c b/arch/arm/mach-omap2/powerdomains2xxx_data.c
index 9b1a3350057..78739e10f5b 100644
--- a/arch/arm/mach-omap2/powerdomains2xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains2xxx_data.c
@@ -78,7 +78,7 @@ static struct powerdomain core_24xx_pwrdm = {
78 * 2430-specific powerdomains 78 * 2430-specific powerdomains
79 */ 79 */
80 80
81#ifdef CONFIG_ARCH_OMAP2430 81#ifdef CONFIG_SOC_OMAP2430
82 82
83/* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */ 83/* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */
84 84
@@ -97,7 +97,7 @@ static struct powerdomain mdm_pwrdm = {
97 }, 97 },
98}; 98};
99 99
100#endif /* CONFIG_ARCH_OMAP2430 */ 100#endif /* CONFIG_SOC_OMAP2430 */
101 101
102/* As powerdomains are added or removed above, this list must also be changed */ 102/* As powerdomains are added or removed above, this list must also be changed */
103static struct powerdomain *powerdomains_omap2xxx[] __initdata = { 103static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
@@ -111,7 +111,7 @@ static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
111 &core_24xx_pwrdm, 111 &core_24xx_pwrdm,
112#endif 112#endif
113 113
114#ifdef CONFIG_ARCH_OMAP2430 114#ifdef CONFIG_SOC_OMAP2430
115 &mdm_pwrdm, 115 &mdm_pwrdm,
116#endif 116#endif
117 NULL 117 NULL
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
index 862dda95d61..f7fed608019 100644
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@ -54,7 +54,7 @@ static cycle_t notrace omap16xx_32k_read(struct clocksource *cs)
54#define omap16xx_32k_read NULL 54#define omap16xx_32k_read NULL
55#endif 55#endif
56 56
57#ifdef CONFIG_ARCH_OMAP2420 57#ifdef CONFIG_SOC_OMAP2420
58static cycle_t notrace omap2420_32k_read(struct clocksource *cs) 58static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
59{ 59{
60 return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k; 60 return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k;
@@ -63,7 +63,7 @@ static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
63#define omap2420_32k_read NULL 63#define omap2420_32k_read NULL
64#endif 64#endif
65 65
66#ifdef CONFIG_ARCH_OMAP2430 66#ifdef CONFIG_SOC_OMAP2430
67static cycle_t notrace omap2430_32k_read(struct clocksource *cs) 67static cycle_t notrace omap2430_32k_read(struct clocksource *cs)
68{ 68{
69 return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k; 69 return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k;
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 3fd8b405572..73d91ee43de 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -170,11 +170,11 @@ IS_OMAP_SUBCLASS(443x, 0x443)
170# undef cpu_is_omap24xx 170# undef cpu_is_omap24xx
171# define cpu_is_omap24xx() is_omap24xx() 171# define cpu_is_omap24xx() is_omap24xx()
172# endif 172# endif
173# if defined (CONFIG_ARCH_OMAP2420) 173# if defined (CONFIG_SOC_OMAP2420)
174# undef cpu_is_omap242x 174# undef cpu_is_omap242x
175# define cpu_is_omap242x() is_omap242x() 175# define cpu_is_omap242x() is_omap242x()
176# endif 176# endif
177# if defined (CONFIG_ARCH_OMAP2430) 177# if defined (CONFIG_SOC_OMAP2430)
178# undef cpu_is_omap243x 178# undef cpu_is_omap243x
179# define cpu_is_omap243x() is_omap243x() 179# define cpu_is_omap243x() is_omap243x()
180# endif 180# endif
@@ -189,11 +189,11 @@ IS_OMAP_SUBCLASS(443x, 0x443)
189# undef cpu_is_omap24xx 189# undef cpu_is_omap24xx
190# define cpu_is_omap24xx() 1 190# define cpu_is_omap24xx() 1
191# endif 191# endif
192# if defined(CONFIG_ARCH_OMAP2420) 192# if defined(CONFIG_SOC_OMAP2420)
193# undef cpu_is_omap242x 193# undef cpu_is_omap242x
194# define cpu_is_omap242x() 1 194# define cpu_is_omap242x() 1
195# endif 195# endif
196# if defined(CONFIG_ARCH_OMAP2430) 196# if defined(CONFIG_SOC_OMAP2430)
197# undef cpu_is_omap243x 197# undef cpu_is_omap243x
198# define cpu_is_omap243x() 1 198# define cpu_is_omap243x() 1
199# endif 199# endif
@@ -201,7 +201,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
201# undef cpu_is_omap34xx 201# undef cpu_is_omap34xx
202# define cpu_is_omap34xx() 1 202# define cpu_is_omap34xx() 1
203# endif 203# endif
204# if defined(CONFIG_ARCH_OMAP3430) 204# if defined(CONFIG_SOC_OMAP3430)
205# undef cpu_is_omap343x 205# undef cpu_is_omap343x
206# define cpu_is_omap343x() 1 206# define cpu_is_omap343x() 1
207# endif 207# endif
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index ef4106c1318..478c5d9b2bd 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -259,7 +259,7 @@ struct omap_sdrc_params;
259extern void omap1_map_common_io(void); 259extern void omap1_map_common_io(void);
260extern void omap1_init_common_hw(void); 260extern void omap1_init_common_hw(void);
261 261
262#ifdef CONFIG_ARCH_OMAP2420 262#ifdef CONFIG_SOC_OMAP2420
263extern void omap242x_map_common_io(void); 263extern void omap242x_map_common_io(void);
264#else 264#else
265static inline void omap242x_map_common_io(void) 265static inline void omap242x_map_common_io(void)
@@ -267,7 +267,7 @@ static inline void omap242x_map_common_io(void)
267} 267}
268#endif 268#endif
269 269
270#ifdef CONFIG_ARCH_OMAP2430 270#ifdef CONFIG_SOC_OMAP2430
271extern void omap243x_map_common_io(void); 271extern void omap243x_map_common_io(void);
272#else 272#else
273static inline void omap243x_map_common_io(void) 273static inline void omap243x_map_common_io(void)
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h
index ffd909fa528..999ffba2690 100644
--- a/arch/arm/plat-omap/include/plat/multi.h
+++ b/arch/arm/plat-omap/include/plat/multi.h
@@ -66,7 +66,7 @@
66# error "OMAP1 and OMAP2PLUS can't be selected at the same time" 66# error "OMAP1 and OMAP2PLUS can't be selected at the same time"
67# endif 67# endif
68#endif 68#endif
69#ifdef CONFIG_ARCH_OMAP2420 69#ifdef CONFIG_SOC_OMAP2420
70# ifdef OMAP_NAME 70# ifdef OMAP_NAME
71# undef MULTI_OMAP2 71# undef MULTI_OMAP2
72# define MULTI_OMAP2 72# define MULTI_OMAP2
@@ -74,7 +74,7 @@
74# define OMAP_NAME omap2420 74# define OMAP_NAME omap2420
75# endif 75# endif
76#endif 76#endif
77#ifdef CONFIG_ARCH_OMAP2430 77#ifdef CONFIG_SOC_OMAP2430
78# ifdef OMAP_NAME 78# ifdef OMAP_NAME
79# undef MULTI_OMAP2 79# undef MULTI_OMAP2
80# define MULTI_OMAP2 80# define MULTI_OMAP2
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index e26e50487d6..aedcb3be4e6 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -312,7 +312,7 @@ u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass)
312} 312}
313#endif 313#endif
314 314
315#ifdef CONFIG_ARCH_OMAP2420 315#ifdef CONFIG_SOC_OMAP2420
316static int __init omap242x_sram_init(void) 316static int __init omap242x_sram_init(void)
317{ 317{
318 _omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init, 318 _omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init,
@@ -333,7 +333,7 @@ static inline int omap242x_sram_init(void)
333} 333}
334#endif 334#endif
335 335
336#ifdef CONFIG_ARCH_OMAP2430 336#ifdef CONFIG_SOC_OMAP2430
337static int __init omap243x_sram_init(void) 337static int __init omap243x_sram_init(void)
338{ 338{
339 _omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init, 339 _omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init,
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index afe8c6fa166..54f91321749 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -225,7 +225,7 @@ config MMC_OMAP
225 225
226config MMC_OMAP_HS 226config MMC_OMAP_HS
227 tristate "TI OMAP High Speed Multimedia Card Interface support" 227 tristate "TI OMAP High Speed Multimedia Card Interface support"
228 depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 228 depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
229 help 229 help
230 This selects the TI OMAP High Speed Multimedia card Interface. 230 This selects the TI OMAP High Speed Multimedia card Interface.
231 If you have an OMAP2430 or OMAP3 board or OMAP4 board with a 231 If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index abb1ffbf3d2..f076cc5c6fb 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1111,7 +1111,7 @@ static u8 __initdata spi2_txdma_id[] = {
1111 OMAP24XX_DMA_SPI2_TX1, 1111 OMAP24XX_DMA_SPI2_TX1,
1112}; 1112};
1113 1113
1114#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ 1114#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
1115 || defined(CONFIG_ARCH_OMAP4) 1115 || defined(CONFIG_ARCH_OMAP4)
1116static u8 __initdata spi3_rxdma_id[] = { 1116static u8 __initdata spi3_rxdma_id[] = {
1117 OMAP24XX_DMA_SPI3_RX0, 1117 OMAP24XX_DMA_SPI3_RX0,
@@ -1154,7 +1154,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
1154 txdma_id = spi2_txdma_id; 1154 txdma_id = spi2_txdma_id;
1155 num_chipselect = 2; 1155 num_chipselect = 2;
1156 break; 1156 break;
1157#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \ 1157#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
1158 || defined(CONFIG_ARCH_OMAP4) 1158 || defined(CONFIG_ARCH_OMAP4)
1159 case 3: 1159 case 3:
1160 rxdma_id = spi3_rxdma_id; 1160 rxdma_id = spi3_rxdma_id;
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 07cf394e491..c7878f1e946 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1535,7 +1535,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
1535 1535
1536/*-------------------------------------------------------------------------*/ 1536/*-------------------------------------------------------------------------*/
1537 1537
1538#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \ 1538#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
1539 defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \ 1539 defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \
1540 defined(CONFIG_ARCH_U5500) 1540 defined(CONFIG_ARCH_U5500)
1541 1541
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d0c236f8e19..64b7fb1583c 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -212,8 +212,8 @@ enum musb_g_ep0_state {
212 * directly with the "flat" model, or after setting up an index register. 212 * directly with the "flat" model, or after setting up an index register.
213 */ 213 */
214 214
215#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ 215#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_SOC_OMAP2430) \
216 || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) \ 216 || defined(CONFIG_SOC_OMAP3430) || defined(CONFIG_BLACKFIN) \
217 || defined(CONFIG_ARCH_OMAP4) 217 || defined(CONFIG_ARCH_OMAP4)
218/* REVISIT indexed access seemed to 218/* REVISIT indexed access seemed to
219 * misbehave (on DaVinci) for at least peripheral IN ... 219 * misbehave (on DaVinci) for at least peripheral IN ...
@@ -358,7 +358,7 @@ struct musb_csr_regs {
358 358
359struct musb_context_registers { 359struct musb_context_registers {
360 360
361#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \ 361#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
362 defined(CONFIG_ARCH_OMAP4) 362 defined(CONFIG_ARCH_OMAP4)
363 u32 otg_sysconfig, otg_forcestandby; 363 u32 otg_sysconfig, otg_forcestandby;
364#endif 364#endif
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index f763d62f151..cc651cd8955 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -31,7 +31,7 @@
31 * 31 *
32 */ 32 */
33 33
34#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) 34#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
35#include "omap2430.h" 35#include "omap2430.h"
36#endif 36#endif
37 37
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 80b3b123dd7..7c608c5ccf8 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -60,7 +60,7 @@ config W1_MASTER_GPIO
60 60
61config HDQ_MASTER_OMAP 61config HDQ_MASTER_OMAP
62 tristate "OMAP HDQ driver" 62 tristate "OMAP HDQ driver"
63 depends on ARCH_OMAP2430 || ARCH_OMAP3 63 depends on SOC_OMAP2430 || ARCH_OMAP3
64 help 64 help
65 Say Y here if you want support for the 1-wire or HDQ Interface 65 Say Y here if you want support for the 1-wire or HDQ Interface
66 on an OMAP processor. 66 on an OMAP processor.
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index d203f4da18a..ede6afde7d2 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -92,7 +92,7 @@ static const unsigned long omap1_mcbsp_port[][2] = {};
92static const int omap24xx_dma_reqs[][2] = { 92static const int omap24xx_dma_reqs[][2] = {
93 { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, 93 { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
94 { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, 94 { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
95#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) 95#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
96 { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, 96 { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
97 { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, 97 { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
98 { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, 98 { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
@@ -113,7 +113,7 @@ static const int omap44xx_dma_reqs[][2] = {
113static const int omap44xx_dma_reqs[][2] = {}; 113static const int omap44xx_dma_reqs[][2] = {};
114#endif 114#endif
115 115
116#if defined(CONFIG_ARCH_OMAP2420) 116#if defined(CONFIG_SOC_OMAP2420)
117static const unsigned long omap2420_mcbsp_port[][2] = { 117static const unsigned long omap2420_mcbsp_port[][2] = {
118 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1, 118 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
119 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 }, 119 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
@@ -124,7 +124,7 @@ static const unsigned long omap2420_mcbsp_port[][2] = {
124static const unsigned long omap2420_mcbsp_port[][2] = {}; 124static const unsigned long omap2420_mcbsp_port[][2] = {};
125#endif 125#endif
126 126
127#if defined(CONFIG_ARCH_OMAP2430) 127#if defined(CONFIG_SOC_OMAP2430)
128static const unsigned long omap2430_mcbsp_port[][2] = { 128static const unsigned long omap2430_mcbsp_port[][2] = {
129 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, 129 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
130 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, 130 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index 110c106611d..37dc7211ed3 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -43,7 +43,7 @@ enum omap_mcbsp_div {
43 OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */ 43 OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */
44}; 44};
45 45
46#if defined(CONFIG_ARCH_OMAP2420) 46#if defined(CONFIG_SOC_OMAP2420)
47#define NUM_LINKS 2 47#define NUM_LINKS 2
48#endif 48#endif
49#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) 49#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
@@ -54,7 +54,7 @@ enum omap_mcbsp_div {
54#undef NUM_LINKS 54#undef NUM_LINKS
55#define NUM_LINKS 4 55#define NUM_LINKS 4
56#endif 56#endif
57#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) 57#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
58#undef NUM_LINKS 58#undef NUM_LINKS
59#define NUM_LINKS 5 59#define NUM_LINKS 5
60#endif 60#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 21:23:13 -0400