diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-28 11:41:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-28 11:41:57 -0500 |
| commit | 78a768b6ca40e104442ade090226ed4ee0e6cebf (patch) | |
| tree | f20e2d78107edd3f4247350b5e6d2e2560bff9d8 /arch/m68knommu/kernel/Makefile | |
| parent | d8204ee2ad1c9babd7e33d4c118ec99a78a8442e (diff) | |
| parent | add8240eedb586b9d885c324db7f98fc1a470f9f (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:
m68knommu: fix 5329 ColdFire periphal addressing
uclinux: add process name to allocation error message
m68knommu: correct the mii calculations for 532x ColdFire FEC
m68knommu: add ColdFire M532x to the FEC configuration options
m68knommu: fix syscall restarting
m68knommu: remove the obsolete and long unused comempci chip support
m68knommu: remove the no longer used PCI support option
m68knommu: remove obsolete and unused eLIA board
m68knommu: set NO_DMA
m68knommu: fix cache flushing for the 527x ColdFire processors
m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
m68knommu: use one exist from execption
Diffstat (limited to 'arch/m68knommu/kernel/Makefile')
| -rw-r--r-- | arch/m68knommu/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/Makefile b/arch/m68knommu/kernel/Makefile index f0eab3dedb5a..37c3fc074c0a 100644 --- a/arch/m68knommu/kernel/Makefile +++ b/arch/m68knommu/kernel/Makefile | |||
| @@ -8,4 +8,3 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \ | |||
| 8 | setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o | 8 | setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_MODULES) += module.o | 10 | obj-$(CONFIG_MODULES) += module.o |
| 11 | obj-$(CONFIG_COMEMPCI) += comempci.o | ||