diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:58:53 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 14:58:53 +0000 |
| commit | a3a3c4664184f86ef964323d106c62158e2b3f25 (patch) | |
| tree | a9b10a59f5ad8c2ac0196fca9b4e1eeaf75dbb4b /arch/arm/mach-davinci/include/mach/hardware.h | |
| parent | 96a3eab338c01e172745b1686c51c1be96ce9ead (diff) | |
| parent | 6ea96e111e6a7f06ef62227bf64e8cd65bd705b3 (diff) | |
Merge branch 'davinci/cleanups' into next/cleanup
* davinci/cleanups:
ARM: davinci: add back dummy header files
ARM: davinci: dm644x: don't force vpfe registeration on all boards
ARM: davinci: dm644x: fix inconsistent variable naming
ARM: davinci: dm644x: improve readability using macro
ARM: davinci: streamline sysmod access
ARM: davinci: create new common platform header for davinci
ARM: davinci: dm646x: move private definitions to C file
ARM: davinci: dm365: move private definitions to C file
ARM: davinci: dm644x: move private definitions to C file
Conflicts:
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-neuros-osd2.c
arch/arm/mach-davinci/board-sffsdr.c
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index 414e0b93e74..0209b1fc22a 100644 --- a/arch/arm/mach-davinci/include/mach/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h @@ -19,8 +19,6 @@ * and the chip/board init code should then explicitly include * <chipname>.h */ -#define DAVINCI_SYSTEM_MODULE_BASE 0x01C40000 - /* * I/O mapping */ |