diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/alpha/kernel/sys_jensen.c | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/kernel/sys_jensen.c')
| -rw-r--r-- | arch/alpha/kernel/sys_jensen.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c index 5a0af11b3a61..608f2a7fa0a3 100644 --- a/arch/alpha/kernel/sys_jensen.c +++ b/arch/alpha/kernel/sys_jensen.c | |||
| @@ -224,8 +224,6 @@ struct alpha_machine_vector jensen_mv __initmv = { | |||
| 224 | .machine_check = jensen_machine_check, | 224 | .machine_check = jensen_machine_check, |
| 225 | .max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS, | 225 | .max_isa_dma_address = ALPHA_MAX_ISA_DMA_ADDRESS, |
| 226 | .rtc_port = 0x170, | 226 | .rtc_port = 0x170, |
| 227 | .rtc_get_time = common_get_rtc_time, | ||
| 228 | .rtc_set_time = common_set_rtc_time, | ||
| 229 | 227 | ||
| 230 | .nr_irqs = 16, | 228 | .nr_irqs = 16, |
| 231 | .device_interrupt = jensen_device_interrupt, | 229 | .device_interrupt = jensen_device_interrupt, |