diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-17 18:12:36 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-17 18:12:36 -0500 |
| commit | 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch) | |
| tree | 72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/openrisc/include | |
| parent | 40c0591f0a349ec074357e05c6ab1a3bc951807c (diff) | |
| parent | 19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff) | |
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/openrisc/include')
| -rw-r--r-- | arch/openrisc/include/asm/memblock.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/openrisc/include/asm/memblock.h b/arch/openrisc/include/asm/memblock.h deleted file mode 100644 index bbe5a1c788c..00000000000 --- a/arch/openrisc/include/asm/memblock.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * OpenRISC Linux | ||
| 3 | * | ||
| 4 | * Linux architectural port borrowing liberally from similar works of | ||
| 5 | * others. All original copyrights apply as per the original source | ||
| 6 | * declaration. | ||
| 7 | * | ||
| 8 | * OpenRISC implementation: | ||
| 9 | * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com> | ||
| 10 | * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se> | ||
| 11 | * et al. | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License as published by | ||
| 15 | * the Free Software Foundation; either version 2 of the License, or | ||
| 16 | * (at your option) any later version. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #ifndef __ASM_OPENRISC_MEMBLOCK_H | ||
| 20 | #define __ASM_OPENRISC_MEMBLOCK_H | ||
| 21 | |||
| 22 | /* empty */ | ||
| 23 | |||
| 24 | #endif /* __ASM_OPENRISC_MEMBLOCK_H */ | ||