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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
85xx
/
sbc8560.h
diff --git
a/arch/ppc/platforms/85xx/sbc8560.h
b/arch/ppc/platforms/85xx/sbc8560.h
index
5e1b00c
..
c7d61cf
100644
(file)
--- a/
arch/ppc/platforms/85xx/sbc8560.h
+++ b/
arch/ppc/platforms/85xx/sbc8560.h
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/85xx/sbc8560.h
- *
* Wind River SBC8560 board definitions
*
* Copyright 2003 Motorola Inc.
* Wind River SBC8560 board definitions
*
* Copyright 2003 Motorola Inc.
@@
-15,7
+13,6
@@
#ifndef __MACH_SBC8560_H__
#define __MACH_SBC8560_H__
#ifndef __MACH_SBC8560_H__
#define __MACH_SBC8560_H__
-#include <linux/config.h>
#include <platforms/85xx/sbc85xx.h>
#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)
#include <platforms/85xx/sbc85xx.h>
#define CPM_MAP_ADDR (CCSRBAR + MPC85xx_CPM_OFFSET)