diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 07:54:00 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 07:54:00 +0300 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /arch/arm/mach-kirkwood/lacie_v2-common.h | |
| parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) | |
| download | linux-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
Diffstat (limited to 'arch/arm/mach-kirkwood/lacie_v2-common.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/lacie_v2-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h index af521315b87b..fc64f578536e 100644 --- a/arch/arm/mach-kirkwood/lacie_v2-common.h +++ b/arch/arm/mach-kirkwood/lacie_v2-common.h @@ -13,6 +13,4 @@ void lacie_v2_register_flash(void); void lacie_v2_register_i2c_devices(void); void lacie_v2_hdd_power_init(int hdd_num); -extern struct sys_timer lacie_v2_timer; - #endif |