diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/arm/mach-lpc32xx/phy3250.c | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/arm/mach-lpc32xx/phy3250.c')
| -rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index c1cd5a943ab1..e54f87ec2e4a 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c | |||
| @@ -182,8 +182,8 @@ static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch) | |||
| 182 | static struct pl08x_platform_data pl08x_pd = { | 182 | static struct pl08x_platform_data pl08x_pd = { |
| 183 | .slave_channels = &pl08x_slave_channels[0], | 183 | .slave_channels = &pl08x_slave_channels[0], |
| 184 | .num_slave_channels = ARRAY_SIZE(pl08x_slave_channels), | 184 | .num_slave_channels = ARRAY_SIZE(pl08x_slave_channels), |
| 185 | .get_signal = pl08x_get_signal, | 185 | .get_xfer_signal = pl08x_get_signal, |
| 186 | .put_signal = pl08x_put_signal, | 186 | .put_xfer_signal = pl08x_put_signal, |
| 187 | .lli_buses = PL08X_AHB1, | 187 | .lli_buses = PL08X_AHB1, |
| 188 | .mem_buses = PL08X_AHB1, | 188 | .mem_buses = PL08X_AHB1, |
| 189 | }; | 189 | }; |