diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /include/linux/platform_data/i2c-nomadik.h | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_data/i2c-nomadik.h')
| -rw-r--r-- | include/linux/platform_data/i2c-nomadik.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/i2c-nomadik.h b/include/linux/platform_data/i2c-nomadik.h index c2303c3e480..3a8be9cdc95 100644 --- a/include/linux/platform_data/i2c-nomadik.h +++ b/include/linux/platform_data/i2c-nomadik.h @@ -28,7 +28,7 @@ enum i2c_freq_mode { * @sm: speed mode */ struct nmk_i2c_controller { - unsigned long clk_freq; + u32 clk_freq; unsigned short slsu; unsigned char tft; unsigned char rft; |