diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
| commit | a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9 (patch) | |
| tree | 12d6c61b17e3b3b9874b9a0d1063e711af483b02 /arch/arm/mach-ixp2000/ixdp2800.c | |
| parent | e80ec84d9352419a7c0482edfbf1b96eaa4c8b95 (diff) | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/usb.c
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2800.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index d33bcac1ec9..a2e7c393e74 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c @@ -291,5 +291,6 @@ MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform") .init_irq = ixdp2800_init_irq, .timer = &ixdp2800_timer, .init_machine = ixdp2x00_init_machine, + .restart = ixp2000_restart, MACHINE_END |