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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
parisc
/
eisa_eeprom.c
diff --git
a/drivers/parisc/eisa_eeprom.c
b/drivers/parisc/eisa_eeprom.c
index
cce00ed
..
af212c6
100644
(file)
--- a/
drivers/parisc/eisa_eeprom.c
+++ b/
drivers/parisc/eisa_eeprom.c
@@
-24,7
+24,6
@@
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/fs.h>
#include <asm/io.h>
#include <asm/uaccess.h>