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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
ibmstb4.h
diff --git
a/arch/ppc/platforms/4xx/ibmstb4.h
b/arch/ppc/platforms/4xx/ibmstb4.h
index
367012f
..
9de4265
100644
(file)
--- a/
arch/ppc/platforms/4xx/ibmstb4.h
+++ b/
arch/ppc/platforms/4xx/ibmstb4.h
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/4xx/ibmstb4.h
- *
* Author: Armin Kuster <akuster@mvista.com>
*
* 2001 (c) MontaVista, Software, Inc. This file is licensed under
* Author: Armin Kuster <akuster@mvista.com>
*
* 2001 (c) MontaVista, Software, Inc. This file is licensed under
@@
-14,7
+12,6
@@
#define __ASM_IBMSTB4_H__
#include <linux/config.h>
#define __ASM_IBMSTB4_H__
#include <linux/config.h>
-#include <platforms/4xx/ibm_ocp.h>
/* serial port defines */
#define STB04xxx_IO_BASE ((uint)0xe0000000)
/* serial port defines */
#define STB04xxx_IO_BASE ((uint)0xe0000000)
@@
-74,9
+71,9
@@
#define OPB0_BASE 0x40000000
#define GPIO0_BASE 0x40060000
#define OPB0_BASE 0x40000000
#define GPIO0_BASE 0x40060000
+#define USB0_BASE 0x40010000
+#define USB0_SIZE 0xA0
#define USB0_IRQ 18
#define USB0_IRQ 18
-#define USB0_BASE STB04xxx_MAP_IO_ADDR(0x40010000)
-#define USB0_EXTENT 4096
#define IIC_NUMS 2
#define UART_NUMS 3
#define IIC_NUMS 2
#define UART_NUMS 3