diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 17:06:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 17:06:02 -0700 |
| commit | 69539ab1006f6c55cc5243fa82341bb6e59c07ed (patch) | |
| tree | 446ef9e4e3b7758e9ab37c1ae28b06d872cd4bd7 /arch/tile/kernel/sysfs.c | |
| parent | 0a49aecaf416377b64d0f03907c2412acbb396be (diff) | |
| parent | ad092338350e517608a41341095b6b1e312c4eb1 (diff) | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile update from Chris Metcalf
"These include a couple of queued-up minor bug fixes from the
community, a fix to unbreak the sysfs hooks in tile, and syncing up
the defconfigs."
Ugh. defconfigs updates without "make minconfig". Tons of ugly
pointless lines there, I suspect.
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: Use set_current_blocked() and block_sigmask()
arch/tile: misplaced parens near likely
arch/tile: sync up the defconfig files to the tip
arch/tile: Fix up from commit 8a25a2fd126c621f44f3aeaef80d51f00fc11639
Diffstat (limited to 'arch/tile/kernel/sysfs.c')
| -rw-r--r-- | arch/tile/kernel/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c index f862b005eb7..71ae728e9d0 100644 --- a/arch/tile/kernel/sysfs.c +++ b/arch/tile/kernel/sysfs.c @@ -163,7 +163,7 @@ static int __init create_sysfs_entries(void) #define create_hv_attr(name) \ if (!err) \ - err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name); + err = sysfs_create_file(hypervisor_kobj, &dev_attr_##name.attr); create_hv_attr(type); create_hv_attr(version); create_hv_attr(config_version); |