summaryrefslogtreecommitdiffstats
path: root/arch/mips/ar7/setup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-02 08:20:32 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-02 08:20:35 +0200
commitf14eff1cc2f418a7c5e23aedc6a1bdca3343b871 (patch)
treefd8d5f7ed2b2e94eff4007e8da0e9ed205d8d5c9 /arch/mips/ar7/setup.c
parentsched: Rename init_cfs_rq => init_tg_cfs_rq (diff)
parentLinux 2.6.31-rc8 (diff)
downloadlinux-f14eff1cc2f418a7c5e23aedc6a1bdca3343b871.tar.xz
linux-f14eff1cc2f418a7c5e23aedc6a1bdca3343b871.zip
Merge commit 'v2.6.31-rc8' into sched/core
Merge reason: bump from rc5 to rc8, but also pick up TP_perf_assign() API, a patch will be queued that depends on it. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/ar7/setup.c')
-rw-r--r--arch/mips/ar7/setup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index 6ebb5f16d967..39f6b5b96463 100644
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -15,7 +15,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/pm.h>