diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:15:55 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:16:04 +0000 |
| commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
| tree | 14af84e9a635e59293edf81aa562b6740c57d310 /include | |
| parent | Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2 (diff) | |
| parent | Merge branch 'kirkwood_dt_for_3.4_v3' of git://git.infradead.org/users/jcooper/linux-kirkwood into kirkwood/dt (diff) | |
| download | linux-dev-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.xz linux-dev-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.zip | |
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spi/orion_spi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/spi/orion_spi.h b/include/linux/spi/orion_spi.h index decf6d8c77b7..b4d9fa6f797c 100644 --- a/include/linux/spi/orion_spi.h +++ b/include/linux/spi/orion_spi.h @@ -11,7 +11,6 @@ struct orion_spi_info { u32 tclk; /* no <linux/clk.h> support yet */ - u32 enable_clock_fix; }; |