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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
net
/
can
/
softing
/
softing_main.c
diff --git
a/drivers/net/can/softing/softing_main.c
b/drivers/net/can/softing/softing_main.c
index
f76e88e
..
09a8b86
100644
(file)
--- a/
drivers/net/can/softing/softing_main.c
+++ b/
drivers/net/can/softing/softing_main.c
@@
-17,10
+17,10
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <asm/io.h>
#include "softing.h"