projects
/
cascardo
/
linux.git
/ 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.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
drivers
/
firewire
/
core-card.c
diff --git
a/drivers/firewire/core-card.c
b/drivers/firewire/core-card.c
index
29d2423
..
85661b0
100644
(file)
--- a/
drivers/firewire/core-card.c
+++ b/
drivers/firewire/core-card.c
@@
-32,7
+32,7
@@
#include <linux/spinlock.h>
#include <linux/workqueue.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/byteorder.h>
#include "core.h"