git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6]
/
drivers
/
bluetooth
/
btmrvl_sdio.h
diff --git
a/drivers/bluetooth/btmrvl_sdio.h
b/drivers/bluetooth/btmrvl_sdio.h
index
2dd284e
..
27329f1
100644
(file)
--- a/
drivers/bluetooth/btmrvl_sdio.h
+++ b/
drivers/bluetooth/btmrvl_sdio.h
@@
-104,4
+104,5
@@
struct btmrvl_sdio_device {
/* Macros for Data Alignment : address */
#define ALIGN_ADDR(p, a) \
- ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
+ ((((unsigned long)(p)) + (((unsigned long)(a)) - 1)) & \
+ ~(((unsigned long)(a)) - 1))