summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-08-02 20:21:23 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-02 20:21:23 -0700
commit1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch)
treeecfe847dda816361d83b1da6d7213b27721e7fd7 /include
parenta166222cde740b34d97fe49dca70348197f4534e (diff)
parente252630f1fd1d14ac4081e566d2f697ae1779215 (diff)
downloadlinux-3.10-1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c.tar.gz
linux-3.10-1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c.tar.bz2
linux-3.10-1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c.zip
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.h2
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);