diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
| commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
| tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /include | |
| parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
| parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap/clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h index 3c4eb9fbe48..f83003f5287 100644 --- a/include/asm-arm/arch-omap/clock.h +++ b/include/asm-arm/arch-omap/clock.h @@ -48,8 +48,6 @@ struct clk_functions { }; extern unsigned int mpurate; -extern struct list_head clocks; -extern spinlock_t clockfw_lock; extern int clk_init(struct clk_functions * custom_clocks); extern int clk_register(struct clk *clk); |