diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-04-02 18:46:27 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 18:46:27 +0200 |
| commit | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (patch) | |
| tree | f08247e64219571b634faf5a809e8505fb0292f2 /arch/arm/plat-omap/Makefile | |
| parent | [ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2 (diff) | |
| download | linux-120db2cba8e40c562e5a4aea44ede2f360a5de75.tar.xz linux-120db2cba8e40c562e5a4aea44ede2f360a5de75.zip | |
[ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
Patch from Tony Lindgren
Update misc OMAP core code from linux-omap tree:
- McBSP updates by Samuel Ortiz, Andrzej Zaborowski
- Whitespace cleanups by Ladislav Michl
- Other fixes by various linux-omap developers
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap/Makefile')
| -rw-r--r-- | arch/arm/plat-omap/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 9ccf1943fc94..2896b4546411 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,16 +3,16 @@ # # Common support -obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o mcbsp.o usb.o +obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o mcbsp.o usb.o fb.o obj-m := obj-n := obj- := +obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o + # OCPI interconnect support for 1710, 1610 and 5912 obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o -# Power Management -obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_FREQ) += cpu-omap.o obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o |