1 files changed, 0 insertions, 120 deletions
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h
deleted file mode 100644
index 324d31b14852..000000000000
--- a/arch/arm/plat-omap/include/plat/multi.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Support for compiling in multiple OMAP processors
- *
- * Copyright (C) 2010 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#ifndef __PLAT_OMAP_MULTI_H
-#define __PLAT_OMAP_MULTI_H
-/*
- * Test if multicore OMAP support is needed
- */
-#undef MULTI_OMAP1
-#undef MULTI_OMAP2
-#undef OMAP_NAME
-#ifdef CONFIG_ARCH_OMAP730
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP1
-#  define MULTI_OMAP1
-# else
-#  define OMAP_NAME omap730
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP850
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP1
-#  define MULTI_OMAP1
-# else
-#  define OMAP_NAME omap850
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP1
-#  define MULTI_OMAP1
-# else
-#  define OMAP_NAME omap1510
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP1
-#  define MULTI_OMAP1
-# else
-#  define OMAP_NAME omap16xx
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP2PLUS
-# if (defined(OMAP_NAME) || defined(MULTI_OMAP1))
-#  error "OMAP1 and OMAP2PLUS can't be selected at the same time"
-# endif
-#endif
-#ifdef CONFIG_SOC_OMAP2420
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap2420
-# endif
-#endif
-#ifdef CONFIG_SOC_OMAP2430
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap2430
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP3
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap3
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap4
-# endif
-#endif
-#ifdef CONFIG_SOC_OMAP5
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap5
-# endif
-#endif
-#ifdef CONFIG_SOC_AM33XX
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME am33xx
-# endif
-#endif
-#endif  /* __PLAT_OMAP_MULTI_H */

diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h deleted file mode 100644 index 324d31b14852..000000000000 --- a/arch/arm/plat-omap/include/plat/multi.h +++ /dev/null
@@ -1,120 +0,0 @@
1	/*
2	* Support for compiling in multiple OMAP processors
3	*
4	* Copyright (C) 2010 Nokia Corporation
5	*
6	* This program is free software; you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License as published by
8	* the Free Software Foundation; either version 2 of the License, or
9	* (at your option) any later version.
10	*
11	* This program is distributed in the hope that it will be useful,
12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	* GNU General Public License for more details.
15	*
16	* You should have received a copy of the GNU General Public License
17	* along with this program; if not, write to the Free Software
18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19	*
20	*/
21
22	#ifndef __PLAT_OMAP_MULTI_H
23	#define __PLAT_OMAP_MULTI_H
24
25	/*
26	* Test if multicore OMAP support is needed
27	*/
28	#undef MULTI_OMAP1
29	#undef MULTI_OMAP2
30	#undef OMAP_NAME
31
32	#ifdef CONFIG_ARCH_OMAP730
33	# ifdef OMAP_NAME
34	# undef MULTI_OMAP1
35	# define MULTI_OMAP1
36	# else
37	# define OMAP_NAME omap730
38	# endif
39	#endif
40	#ifdef CONFIG_ARCH_OMAP850
41	# ifdef OMAP_NAME
42	# undef MULTI_OMAP1
43	# define MULTI_OMAP1
44	# else
45	# define OMAP_NAME omap850
46	# endif
47	#endif
48	#ifdef CONFIG_ARCH_OMAP15XX
49	# ifdef OMAP_NAME
50	# undef MULTI_OMAP1
51	# define MULTI_OMAP1
52	# else
53	# define OMAP_NAME omap1510
54	# endif
55	#endif
56	#ifdef CONFIG_ARCH_OMAP16XX
57	# ifdef OMAP_NAME
58	# undef MULTI_OMAP1
59	# define MULTI_OMAP1
60	# else
61	# define OMAP_NAME omap16xx
62	# endif
63	#endif
64	#ifdef CONFIG_ARCH_OMAP2PLUS
65	# if (defined(OMAP_NAME) \|\| defined(MULTI_OMAP1))
66	# error "OMAP1 and OMAP2PLUS can't be selected at the same time"
67	# endif
68	#endif
69	#ifdef CONFIG_SOC_OMAP2420
70	# ifdef OMAP_NAME
71	# undef MULTI_OMAP2
72	# define MULTI_OMAP2
73	# else
74	# define OMAP_NAME omap2420
75	# endif
76	#endif
77	#ifdef CONFIG_SOC_OMAP2430
78	# ifdef OMAP_NAME
79	# undef MULTI_OMAP2
80	# define MULTI_OMAP2
81	# else
82	# define OMAP_NAME omap2430
83	# endif
84	#endif
85	#ifdef CONFIG_ARCH_OMAP3
86	# ifdef OMAP_NAME
87	# undef MULTI_OMAP2
88	# define MULTI_OMAP2
89	# else
90	# define OMAP_NAME omap3
91	# endif
92	#endif
93	#ifdef CONFIG_ARCH_OMAP4
94	# ifdef OMAP_NAME
95	# undef MULTI_OMAP2
96	# define MULTI_OMAP2
97	# else
98	# define OMAP_NAME omap4
99	# endif
100	#endif
101
102	#ifdef CONFIG_SOC_OMAP5
103	# ifdef OMAP_NAME
104	# undef MULTI_OMAP2
105	# define MULTI_OMAP2
106	# else
107	# define OMAP_NAME omap5
108	# endif
109	#endif
110
111	#ifdef CONFIG_SOC_AM33XX
112	# ifdef OMAP_NAME
113	# undef MULTI_OMAP2
114	# define MULTI_OMAP2
115	# else
116	# define OMAP_NAME am33xx
117	# endif
118	#endif
119
120	#endif /* __PLAT_OMAP_MULTI_H */