Commit 0c3efe54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: mpc8xxx_wdt: fix build
parents 132452ee d856b418

drivers/watchdog/mpc8xxx_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev) 


	if (!ofdev->dev.of_match)

		return -EINVAL;

	wdt_type = match->data;

	wdt_type = ofdev->dev.of_match->data;



	if (!freq || freq == -1)

		return -EINVAL;