diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:30:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 13:30:03 -0400 |
| commit | f8974cb71310a05632aada76be6a27576d61e609 (patch) | |
| tree | c0b6f59333796c95aa2de9a2eb755e9b68599b71 /drivers/macintosh | |
| parent | c207f3a43194e108dda43dc9a1ce507335cff6b9 (diff) | |
| parent | 0f22dd395fc473cee252b9af50249b8e0f32fde7 (diff) | |
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull core device tree changes for Linux v3.4 from Grant Likely:
"This branch contains a minor documentation addition, a utility
function for parsing string properties needed by some of the new ARM
platforms, disables dynamic DT code that isn't used anywhere but on a
few PPC machines, and exports DT node compatible data to userspace via
UEVENT properties. Nothing earth shattering here."
* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
of: Only compile OF_DYNAMIC on PowerPC pseries and iseries
arm/dts: OMAP3: Add omap3evm and am335xevm support
drivercore: Output common devicetree information in uevent
of: Add of_property_match_string() to find index into a string list
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 4daf9e5a7736..20e5c2cda430 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
| @@ -137,7 +137,7 @@ extern struct device_attribute macio_dev_attrs[]; | |||
| 137 | struct bus_type macio_bus_type = { | 137 | struct bus_type macio_bus_type = { |
| 138 | .name = "macio", | 138 | .name = "macio", |
| 139 | .match = macio_bus_match, | 139 | .match = macio_bus_match, |
| 140 | .uevent = of_device_uevent, | 140 | .uevent = of_device_uevent_modalias, |
| 141 | .probe = macio_device_probe, | 141 | .probe = macio_device_probe, |
| 142 | .remove = macio_device_remove, | 142 | .remove = macio_device_remove, |
| 143 | .shutdown = macio_device_shutdown, | 143 | .shutdown = macio_device_shutdown, |