Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295623
b: refs/heads/master
c: a4f3419
h: refs/heads/master
i:
  295621: 7f3e189
  295619: f58c102
  295615: 133bbbe
v: v3
  • Loading branch information
Tony Lindgren committed Feb 24, 2012
1 parent 5e40eb7 commit 83256a0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5
refs/heads/master: a4f34197120be8edfe099bb6cde35740d299b6d1
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-omap1/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ void omap1_restart(char, const char *);

extern struct sys_timer omap1_timer;
extern bool omap_32k_timer_init(void);
extern void __init omap_init_consistent_dma_size(void);

#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-omap2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ void am33xx_map_io(void);
void omap4_map_io(void);
void ti81xx_map_io(void);

extern void __init omap_init_consistent_dma_size(void);

/**
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/arm/plat-omap/include/plat/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,6 @@ extern void omap_writeb(u8 v, u32 pa);
extern void omap_writew(u16 v, u32 pa);
extern void omap_writel(u32 v, u32 pa);

extern void __init omap_init_consistent_dma_size(void);

#endif

#endif

0 comments on commit 83256a0

Please sign in to comment.