Merge branch 'for_2_6_33' of git://git.pwsan.com/linux-2.6 into omap-…

…for-linus
git-mirror · Dec 12, 2009 · 24ed45a · 24ed45a
2 parents aa2cf42 + 911bd73
commit 24ed45a
Show file tree

Hide file tree

Showing 55 changed files with 14,301 additions and 6,547 deletions.
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
@@ -3,7 +3,8 @@
 #
 
 # Common support
-obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o devices.o
+obj-y := io.o id.o sram.o irq.o mux.o serial.o devices.o
+obj-y += clock.o clock_data.o opp_data.o
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o