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 master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
setup.c
diff --git
a/arch/cris/arch-v32/kernel/setup.c
b/arch/cris/arch-v32/kernel/setup.c
index
b17a39a
..
4662f36
100644
(file)
--- a/
arch/cris/arch-v32/kernel/setup.c
+++ b/
arch/cris/arch-v32/kernel/setup.c
@@
-4,7
+4,6
@@
* Copyright (C) 2003, Axis Communications AB.
*/
* Copyright (C) 2003, Axis Communications AB.
*/
-#include <linux/config.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <linux/delay.h>