diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 13:11:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 13:11:53 -0700 |
| commit | 6c2580c501c660fdfb506061e016d84570fceba1 (patch) | |
| tree | c194f82f1327e5453a7fcd702eb9c33a997ca6a5 | |
| parent | 8742f229b635bf1c1c84a3dfe5e47c814c20b5c8 (diff) | |
| parent | c4afd7b95fff2f4964e630d0de90e8bc94ae37f1 (diff) | |
| download | linux-6c2580c501c660fdfb506061e016d84570fceba1.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 build fix from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: boards/atngw100/mrmt.c: fix building error
| -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 = { static struct platform_device rmt_ts_device = { .name = "ucb1400_ts", .id = -1, - } }; #endif |