Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24ed45aa authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

parents aa2cf420 911bd739

arch/arm/mach-omap1/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,8 @@ 
#

#





# Common support

# 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

obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

arch/arm/mach-omap1/clock.c

+112 −389

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap1/clock.h

+37 −615

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap1/clock_data.c

0 → 100644
+843 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap1/io.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ 
#include <plat/mux.h>

#include <plat/mux.h>

#include <plat/tc.h>

#include <plat/tc.h>





extern int omap1_clk_init(void);

#include "clock.h"



extern void omap_check_revision(void);

extern void omap_check_revision(void);

extern void omap_sram_init(void);

extern void omap_sram_init(void);

extern void omapfb_reserve_sdram(void);

extern void omapfb_reserve_sdram(void);