diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/sh/include/mach-common/mach/edosk7705.h | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/sh/include/mach-common/mach/edosk7705.h')
| -rw-r--r-- | arch/sh/include/mach-common/mach/edosk7705.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/include/mach-common/mach/edosk7705.h b/arch/sh/include/mach-common/mach/edosk7705.h deleted file mode 100644 index efc43b323466..000000000000 --- a/arch/sh/include/mach-common/mach/edosk7705.h +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | #ifndef __ASM_SH_EDOSK7705_H | ||
| 2 | #define __ASM_SH_EDOSK7705_H | ||
| 3 | |||
| 4 | #define __IO_PREFIX sh_edosk7705 | ||
| 5 | #include <asm/io_generic.h> | ||
| 6 | |||
| 7 | #endif /* __ASM_SH_EDOSK7705_H */ | ||