diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /arch/m68knommu/platform/5307/Makefile | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'arch/m68knommu/platform/5307/Makefile')
| -rw-r--r-- | arch/m68knommu/platform/5307/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/platform/5307/Makefile b/arch/m68knommu/platform/5307/Makefile index 8d1619dc1ea..2fd37dcc309 100644 --- a/arch/m68knommu/platform/5307/Makefile +++ b/arch/m68knommu/platform/5307/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_M5249) += timers.o obj-$(CONFIG_M527x) += pit.o obj-$(CONFIG_M5272) += timers.o obj-$(CONFIG_M5307) += config.o timers.o +obj-$(CONFIG_M532x) += timers.o obj-$(CONFIG_M528x) += pit.o obj-$(CONFIG_M5407) += timers.o |