diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 17:46:16 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 17:46:16 +0200 |
commit | 81211c4cc04ca33f7c3ae10de547113e34d9a59e (patch) | |
tree | 974df8aac30b4dfaa8bd2f8caddb6611bcb19ae4 /drivers/block/rsxx/rsxx_cfg.h | |
parent | MAINTAINERS: Add maintainer for LPC32xx (diff) | |
parent | ARM: mxs: Slow down the I2C clock speed (diff) | |
download | linux-81211c4cc04ca33f7c3ae10de547113e34d9a59e.tar.xz linux-81211c4cc04ca33f7c3ae10de547113e34d9a59e.zip |
Merge tag 'mxs-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo <shawn.guo@linaro.org>:
The mxs fixes for 3.9, take 4:
- A couple mxs boards that run I2C at 400 kHz experience some unstable
issue occasionally. Slow down the clock speed to have I2C work
reliably.
* tag 'mxs-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: Slow down the I2C clock speed
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/block/rsxx/rsxx_cfg.h')
-rw-r--r-- | drivers/block/rsxx/rsxx_cfg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rsxx/rsxx_cfg.h b/drivers/block/rsxx/rsxx_cfg.h index c025fe5fdb70..f384c943846d 100644 --- a/drivers/block/rsxx/rsxx_cfg.h +++ b/drivers/block/rsxx/rsxx_cfg.h @@ -58,7 +58,7 @@ struct rsxx_card_cfg { }; /* Vendor ID Values */ -#define RSXX_VENDOR_ID_TMS_IBM 0 +#define RSXX_VENDOR_ID_IBM 0 #define RSXX_VENDOR_ID_DSI 1 #define RSXX_VENDOR_COUNT 2 |