diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-14 06:14:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-14 06:14:12 -0400 |
| commit | 397f09977ea350a20f20b415a9313cc790137742 (patch) | |
| tree | 0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /arch/avr32 | |
| parent | 6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff) | |
| parent | a4b4bedce880046feeb5b206392960f395ed02ad (diff) | |
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC
support, from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/avr32')
| -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 | ||