diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 14:48:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 14:48:31 -0700 |
| commit | b57ab7632b8fc1eef139bbbb7a89002be61f99e1 (patch) | |
| tree | 19d4eeea0dbf721312c4e33a423ed29ff70aff88 /arch/sh/boards/renesas/r7780rp/setup.c | |
| parent | f12c03722045882a50c270f6332cf2c7b16a83d2 (diff) | |
| parent | 3760f736716f74bdc62a4ba5406934338da93eb2 (diff) | |
| download | talos-op-linux-b57ab7632b8fc1eef139bbbb7a89002be61f99e1.tar.gz talos-op-linux-b57ab7632b8fc1eef139bbbb7a89002be61f99e1.zip | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Convert most new-style drivers to use module aliasing
i2c: Add support for device alias names
i2c-amd756-s4882: Fix an error path
i2c: Drop unused RTC driver IDs
i2c/tps65010: Add missing intialization of client data
i2c-sis5595: Minor cleanups in sis5595_access
i2c-piix4: Minor cleanups
i2c: Spelling fix (successful)
i2c-stub: No newline in parameter description
Diffstat (limited to 'arch/sh/boards/renesas/r7780rp/setup.c')
| -rw-r--r-- | arch/sh/boards/renesas/r7780rp/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c index a5c5e9236501..ac0a96522e45 100644 --- a/arch/sh/boards/renesas/r7780rp/setup.c +++ b/arch/sh/boards/renesas/r7780rp/setup.c @@ -199,8 +199,7 @@ static struct platform_device smbus_device = { static struct i2c_board_info __initdata highlander_i2c_devices[] = { { - I2C_BOARD_INFO("rtc-rs5c372", 0x32), - .type = "r2025sd", + I2C_BOARD_INFO("r2025sd", 0x32), }, }; |
