projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[deliverable/linux.git]
/
arch
/
arm
/
mach-orion5x
/
rd88f6183ap-ge-setup.c
diff --git
a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index ad2eba9286adf3a1af1b9fa157fb297d68d48735..64317251ec008c93d2890ec3c38e2a3c33a66a3e 100644
(file)
--- a/
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@
-7,7
+7,7
@@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@
-21,7
+21,6
@@
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
-#include <asm/gpio.h>
#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
@@
-122,7
+121,7
@@
subsys_initcall(rd88f6183ap_ge_pci_init);
MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")
/* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")
/* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.init_machine = rd88f6183ap_ge_init,
.map_io = orion5x_map_io,
.init_early = orion5x_init_early,
.init_machine = rd88f6183ap_ge_init,
.map_io = orion5x_map_io,
.init_early = orion5x_init_early,
This page took
0.024276 seconds
and
5
git commands to generate.