git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
85xx
/
mpc85xx_cds_common.h
diff --git
a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
index
5b588cf
..
32c5455
100644
(file)
--- a/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/
arch/ppc/platforms/85xx/mpc85xx_cds_common.h
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/85xx/mpc85xx_cds_common.h
- *
* MPC85xx CDS board definitions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
* MPC85xx CDS board definitions
*
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
@@
-17,7
+15,6
@@
#ifndef __MACH_MPC85XX_CDS_H__
#define __MACH_MPC85XX_CDS_H__
#ifndef __MACH_MPC85XX_CDS_H__
#define __MACH_MPC85XX_CDS_H__
-#include <linux/config.h>
#include <linux/serial.h>
#include <asm/ppcboot.h>
#include <linux/initrd.h>
#include <linux/serial.h>
#include <asm/ppcboot.h>
#include <linux/initrd.h>