diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:44:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 10:44:27 -0400 |
| commit | 4b37ba90f49d4157ac5628f8d730d3505f176724 (patch) | |
| tree | fdb3d04426f7b72ee86b1f06be746624494493c5 /arch/m68knommu/platform/5206e | |
| parent | 229aebb873e29726b91e076161649cf45154b0bf (diff) | |
| parent | 55f411de484a0136a77d050e877578a60bc2e094 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (21 commits)
m68knommu: convert to using tracehook_report_syscall_*
m68knommu: some boards use fixed phy for FEC ethernet
m68knommu: support the external GPIO based interrupts of the 5272
m68knommu: mask of vector bits in exception word properly
m68knommu: change to new flag variables
m68knommu: Fix MCFUART_TXFIFOSIZE for m548x.
m68knommu: add basic mmu-less m548x support
m68knommu: .gitignore vmlinux.lds
m68knommu: stop using __do_IRQ
m68knommu: rename PT_OFF_VECTOR to PT_OFF_FORMATVEC.
m68knommu: add support for Coldfire 547x/548x interrupt controller
m68k{nommu}: Remove unused DEFINE's from asm-offsets.c
m68knommu: whitespace cleanup in 68328/entry.S
m68knommu: Document supported chips in intc-2.c and intc-simr.c.
m68knommu: fix strace support for 68328/68360
m68knommu: fix default starting date
arch/m68knommu: Removing dead 68328_SERIAL_UART2 config option
arch/m68knommu: Removing dead RAM_{16,32}_MB config option
arch/m68knommu: Removing dead M68KFPU_EMU config option
arch/m68knommu: Removing dead RELOCATE config option
...
Diffstat (limited to 'arch/m68knommu/platform/5206e')
| -rw-r--r-- | arch/m68knommu/platform/5206e/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/5206e/Makefile b/arch/m68knommu/platform/5206e/Makefile index 113c33390064..b5db05625cfa 100644 --- a/arch/m68knommu/platform/5206e/Makefile +++ b/arch/m68knommu/platform/5206e/Makefile | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | # on the console port whenever a DBG interrupt occurs. You have to | 8 | # on the console port whenever a DBG interrupt occurs. You have to |
| 9 | # set up you HW breakpoints to trigger a DBG interrupt: | 9 | # set up you HW breakpoints to trigger a DBG interrupt: |
| 10 | # | 10 | # |
| 11 | # EXTRA_CFLAGS += -DTRAP_DBG_INTERRUPT | 11 | # ccflags-y := -DTRAP_DBG_INTERRUPT |
| 12 | # EXTRA_AFLAGS += -DTRAP_DBG_INTERRUPT | 12 | # asflags-y := -DTRAP_DBG_INTERRUPT |
| 13 | # | 13 | # |
| 14 | 14 | ||
| 15 | asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 | 15 | asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 |