diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /arch/avr32/boards | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'arch/avr32/boards')
| -rw-r--r-- | arch/avr32/boards/atngw100/mrmt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c index f91431963452..7de083d19b7e 100644 --- a/arch/avr32/boards/atngw100/mrmt.c +++ b/arch/avr32/boards/atngw100/mrmt.c | |||
| @@ -150,7 +150,6 @@ static struct ac97c_platform_data __initdata ac97c0_data = { | |||
| 150 | static struct platform_device rmt_ts_device = { | 150 | static struct platform_device rmt_ts_device = { |
| 151 | .name = "ucb1400_ts", | 151 | .name = "ucb1400_ts", |
| 152 | .id = -1, | 152 | .id = -1, |
| 153 | } | ||
| 154 | }; | 153 | }; |
| 155 | #endif | 154 | #endif |
| 156 | 155 | ||