git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
drivers
/
atm
/
nicstar.c
diff --git
a/drivers/atm/nicstar.c
b/drivers/atm/nicstar.c
index
6b313ee
..
1c70c45
100644
(file)
--- a/
drivers/atm/nicstar.c
+++ b/
drivers/atm/nicstar.c
@@
-51,7
+51,7
@@
#include <linux/idr.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "nicstar.h"
#ifdef CONFIG_ATM_NICSTAR_USE_SUNI
#include "suni.h"