Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70554775 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: No need to include board-apollon.h from hardware.h 



Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a362fdbd

arch/arm/mach-omap2/board-apollon.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 


#define APOLLON_FLASH_CS	0

#define APOLLON_ETH_CS		1

#define APOLLON_ETHR_GPIO_IRQ	74



static struct mtd_partition apollon_partitions[] = {

	{

arch/arm/plat-omap/include/mach/board-apollon.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * arch/arm/plat-omap/include/mach/board-apollon.h

 *

 * Hardware definitions for Samsung OMAP24XX Apollon board.

 *

 * Initial creation by Kyungmin Park <kyungmin.park@samsung.com>

 *

 * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN

 * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF

 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * 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.,

 * 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#ifndef __ASM_ARCH_OMAP_APOLLON_H

#define __ASM_ARCH_OMAP_APOLLON_H



#include <mach/cpu.h>



extern void apollon_mmc_init(void);



static inline int apollon_plus(void)

{

	/* The apollon plus has IDCODE revision 5 */

	return omap_rev() & 0xc0;

}



/* Placeholder for APOLLON specific defines */

#define APOLLON_ETHR_GPIO_IRQ		74



#endif /*  __ASM_ARCH_OMAP_APOLLON_H */

arch/arm/plat-omap/include/mach/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -306,10 +306,6 @@ 
#include "board-ldp.h"

#endif



#ifdef CONFIG_MACH_OMAP_APOLLON

#include "board-apollon.h"

#endif



#ifdef CONFIG_MACH_VOICEBLUE

#include "board-voiceblue.h"

#endif