Commit 03ebff0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v6.16' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze update from Michal Simek:

 - Small OF update

* tag 'microblaze-v6.16' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Use of_property_present() for non-boolean properties
parents 0f70f5b0 52b70e5b

arch/microblaze/kernel/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int __init xilinx_timer_init(struct device_node *timer) 
	int ret;



	/* If this property is present, the device is a PWM and not a timer */

	if (of_property_read_bool(timer, "#pwm-cells"))

	if (of_property_present(timer, "#pwm-cells"))

		return 0;



	if (initialized)