git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
txx9
/
generic
/
spi_eeprom.c
diff --git
a/arch/mips/txx9/generic/spi_eeprom.c
b/arch/mips/txx9/generic/spi_eeprom.c
index 75c347238f47741792eee5846a3eb2167b1be37a..103abc13d6234764469f33545f6c1710ae74b55e 100644
(file)
--- a/
arch/mips/txx9/generic/spi_eeprom.c
+++ b/
arch/mips/txx9/generic/spi_eeprom.c
@@
-10,6
+10,7
@@
* Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
*/
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/device.h>
#include <linux/spi/spi.h>
#include <linux/spi/eeprom.h>