diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /arch/mips/jazz/setup.c | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | kernel-crypto-cf206bffbb7542df54043fad9898113172af99d8.tar.gz kernel-crypto-cf206bffbb7542df54043fad9898113172af99d8.tar.xz kernel-crypto-cf206bffbb7542df54043fad9898113172af99d8.zip | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'arch/mips/jazz/setup.c')
| -rw-r--r-- | arch/mips/jazz/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index f60524e8bc4..b59ba6b93cd 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -10,7 +10,6 @@ * Copyright (C) 2007 by Thomas Bogendoerfer */ #include <linux/eisa.h> -#include <linux/hdreg.h> #include <linux/init.h> #include <linux/ioport.h> #include <linux/sched.h> @@ -18,7 +17,6 @@ #include <linux/mm.h> #include <linux/console.h> #include <linux/fb.h> -#include <linux/ide.h> #include <linux/pm.h> #include <linux/screen_info.h> #include <linux/platform_device.h> |