diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:42:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:42:43 -0400 |
| commit | 2cf4d4514d5b43c1f3b64bd0ec8b9853bde8f1dc (patch) | |
| tree | e35a625496acc6ac852846d40b8851186b9d1ac4 /arch/arm/plat-mxc/include/mach/debug-macro.S | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
| parent | ce53895a5d24e0ee19fb92f56c17323fb4c9ab27 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
MAINTAINERS: EB110ATX is not ebsa110
MAINTAINERS: update Eric Miao's email address and status
fb: add support of LCD display controller on pxa168/910 (base layer)
[ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
[ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
[ARM] 5544/1: Trust PrimeCell resource sizes
[ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
[ARM] pxa/sharpsl_pm: drop set_irq_type calls
[ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
[ARM] sa1100: remove unused collie_pm.c
[ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
[ARM] 5550/1: Add default configure file for w90p910 platform
[ARM] 5549/1: Add clock api for w90p910 platform.
[ARM] 5548/1: Add gpio api for w90p910 platform
[ARM] 5551/1: Add multi-function pin api for w90p910 platform.
[ARM] Make ARM_VIC_NR depend on ARM_VIC
[ARM] 5546/1: ARM PL022 SSP/SPI driver v3
ARM: OMAP4: SMP: Update defconfig for OMAP4430
ARM: OMAP4: SMP: Enable SMP support for OMAP4430
...
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 4f773148bc2..bbc5f6753cf 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
| @@ -25,6 +25,9 @@ | |||
| 25 | #ifdef CONFIG_MACH_MX27ADS | 25 | #ifdef CONFIG_MACH_MX27ADS |
| 26 | #include <mach/board-mx27ads.h> | 26 | #include <mach/board-mx27ads.h> |
| 27 | #endif | 27 | #endif |
| 28 | #ifdef CONFIG_MACH_MX21ADS | ||
| 29 | #include <mach/board-mx21ads.h> | ||
| 30 | #endif | ||
| 28 | #ifdef CONFIG_MACH_PCM038 | 31 | #ifdef CONFIG_MACH_PCM038 |
| 29 | #include <mach/board-pcm038.h> | 32 | #include <mach/board-pcm038.h> |
| 30 | #endif | 33 | #endif |
| @@ -34,6 +37,21 @@ | |||
| 34 | #ifdef CONFIG_MACH_QONG | 37 | #ifdef CONFIG_MACH_QONG |
| 35 | #include <mach/board-qong.h> | 38 | #include <mach/board-qong.h> |
| 36 | #endif | 39 | #endif |
| 40 | #ifdef CONFIG_MACH_PCM043 | ||
| 41 | #include <mach/board-pcm043.h> | ||
| 42 | #endif | ||
| 43 | #ifdef CONFIG_MACH_MX27_3DS | ||
| 44 | #include <mach/board-mx27pdk.h> | ||
| 45 | #endif | ||
| 46 | #ifdef CONFIG_MACH_ARMADILLO5X0 | ||
| 47 | #include <mach/board-armadillo5x0.h> | ||
| 48 | #endif | ||
| 49 | #ifdef CONFIG_MACH_MX35_3DS | ||
| 50 | #include <mach/board-mx35pdk.h> | ||
| 51 | #endif | ||
| 52 | #ifdef CONFIG_MACH_MX27LITE | ||
| 53 | #include <mach/board-mx27lite.h> | ||
| 54 | #endif | ||
| 37 | .macro addruart,rx | 55 | .macro addruart,rx |
| 38 | mrc p15, 0, \rx, c1, c0 | 56 | mrc p15, 0, \rx, c1, c0 |
| 39 | tst \rx, #1 @ MMU enabled? | 57 | tst \rx, #1 @ MMU enabled? |