Commit 9838309b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'u300/cleanup' into next/cleanup 

* u300/cleanup:
  ARM: u300: delete memory.h
parents 844e8a16 bfd912c0

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -893,7 +893,6 @@ config ARCH_U300 
	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select NEED_MACH_MEMORY_H

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/mach-u300/include/mach/memory.h

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

 *

 * arch/arm/mach-u300/include/mach/memory.h

 *

 *

 * Copyright (C) 2007-2009 ST-Ericsson AB

 * License terms: GNU General Public License (GPL) version 2

 * Memory virtual/physical mapping constants.

 * Author: Linus Walleij <linus.walleij@stericsson.com>

 * Author: Jonas Aaberg <jonas.aberg@stericsson.com>

 */



#ifndef __MACH_MEMORY_H

#define __MACH_MEMORY_H



#define PLAT_PHYS_OFFSET	UL(0x48000000)

#define BOOT_PARAMS_OFFSET	0x100



#endif

arch/arm/mach-u300/u300.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void __init u300_init_machine(void) 


MACHINE_START(U300, MACH_U300_STRING)

	/* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */

	.atag_offset	= BOOT_PARAMS_OFFSET,

	.atag_offset	= 0x100,

	.map_io		= u300_map_io,

	.init_irq	= u300_init_irq,

	.handle_irq	= vic_handle_irq,