Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Aug 8, 2013
2 parents 8742f22 + c4afd7b commit 6c2580c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/avr32/boards/atngw100/mrmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 6c2580c

Please sign in to comment.