mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
66a2886d86
Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
23 lines
612 B
C
23 lines
612 B
C
/*
|
|
* arch/arm/mach-spear6xx/include/mach/misc_regs.h
|
|
*
|
|
* Miscellaneous registers definitions for SPEAr6xx machine family
|
|
*
|
|
* Copyright (C) 2009 ST Microelectronics
|
|
* Viresh Kumar<viresh.kumar@st.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __MACH_MISC_REGS_H
|
|
#define __MACH_MISC_REGS_H
|
|
|
|
#include <mach/spear.h>
|
|
|
|
#define MISC_BASE IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE)
|
|
#define DMA_CHN_CFG (MISC_BASE + 0x0A0)
|
|
|
|
#endif /* __MACH_MISC_REGS_H */
|