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 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
phy
/
phy-rcar-gen2.c
diff --git
a/drivers/phy/phy-rcar-gen2.c
b/drivers/phy/phy-rcar-gen2.c
index
6e0d9fa
..
c7a0599
100644
(file)
--- a/
drivers/phy/phy-rcar-gen2.c
+++ b/
drivers/phy/phy-rcar-gen2.c
@@
-17,8
+17,7
@@
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
-
-#include <asm/cmpxchg.h>
+#include <linux/atomic.h>
#define USBHS_LPSTS 0x02
#define USBHS_UGCTRL 0x80