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 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
kernel
/
cpu
/
hwblk.c
diff --git
a/arch/sh/kernel/cpu/hwblk.c
b/arch/sh/kernel/cpu/hwblk.c
index c0ad7d46e7848687b5103ad826bb1a92b1a284de..67a1e811cfe852851d353f3e63216dc0d99c619a 100644
(file)
--- a/
arch/sh/kernel/cpu/hwblk.c
+++ b/
arch/sh/kernel/cpu/hwblk.c
@@
-1,6
+1,5
@@
#include <linux/clk.h>
#include <linux/compiler.h>
#include <linux/clk.h>
#include <linux/compiler.h>
-#include <linux/slab.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <asm/suspend.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <asm/suspend.h>