diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/timer32k.c (renamed from arch/arm/plat-omap/timer32k.c) | 0 | ||||
-rw-r--r-- | arch/arm/plat-omap/Makefile | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 015a66b3ca8e..c06f5254c0f3 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile | |||
@@ -5,7 +5,8 @@ | |||
5 | # Common support | 5 | # Common support |
6 | obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o | 6 | obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o |
7 | 7 | ||
8 | obj-$(CONFIG_OMAP_MPU_TIMER) += time.o | 8 | obj-$(CONFIG_OMAP_MPU_TIMER) += time.o |
9 | obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o | ||
9 | 10 | ||
10 | # Power Management | 11 | # Power Management |
11 | obj-$(CONFIG_PM) += pm.o sleep.o | 12 | obj-$(CONFIG_PM) += pm.o sleep.o |
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 1f7365f5df24..1f7365f5df24 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c | |||
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index d91424edf576..bc639a30d6d1 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile | |||
@@ -9,10 +9,6 @@ obj-m := | |||
9 | obj-n := | 9 | obj-n := |
10 | obj- := | 10 | obj- := |
11 | 11 | ||
12 | ifeq ($(CONFIG_ARCH_OMAP1),y) | ||
13 | obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o | ||
14 | endif | ||
15 | |||
16 | # OCPI interconnect support for 1710, 1610 and 5912 | 12 | # OCPI interconnect support for 1710, 1610 and 5912 |
17 | obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o | 13 | obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o |
18 | 14 | ||