diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/uwb/hwa-rc.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/uwb/hwa-rc.c')
| -rw-r--r-- | drivers/uwb/hwa-rc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c index 559f8784acf3..9052bcb4f528 100644 --- a/drivers/uwb/hwa-rc.c +++ b/drivers/uwb/hwa-rc.c | |||
| @@ -501,7 +501,7 @@ int hwarc_filter_event_WUSB_0100(struct uwb_rc *rc, struct uwb_rceb **header, | |||
| 501 | int result = -ENOANO; | 501 | int result = -ENOANO; |
| 502 | struct uwb_rceb *rceb = *header; | 502 | struct uwb_rceb *rceb = *header; |
| 503 | int event = le16_to_cpu(rceb->wEvent); | 503 | int event = le16_to_cpu(rceb->wEvent); |
| 504 | size_t event_size; | 504 | ssize_t event_size; |
| 505 | size_t core_size, offset; | 505 | size_t core_size, offset; |
| 506 | 506 | ||
| 507 | if (rceb->bEventType != UWB_RC_CET_GENERAL) | 507 | if (rceb->bEventType != UWB_RC_CET_GENERAL) |