projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
[deliverable/linux.git]
/
arch
/
arm
/
mach-sa1100
/
badge4.c
diff --git
a/arch/arm/mach-sa1100/badge4.c
b/arch/arm/mach-sa1100/badge4.c
index edccd5eb06be917b257d0ec38f1e135734be7243..3efefbdd2527ee966377020bb2add9a08828e09a 100644
(file)
--- a/
arch/arm/mach-sa1100/badge4.c
+++ b/
arch/arm/mach-sa1100/badge4.c
@@
-23,10
+23,10
@@
#include <linux/mtd/partitions.h>
#include <linux/errno.h>
#include <linux/mtd/partitions.h>
#include <linux/errno.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
-#include <
asm/ar
ch/irqs.h>
+#include <
ma
ch/irqs.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
@@
-34,7
+34,7
@@
#include <asm/hardware/sa1111.h>
#include <asm/mach/serial_sa1100.h>
#include <asm/hardware/sa1111.h>
#include <asm/mach/serial_sa1100.h>
-#include <
asm/ar
ch/badge4.h>
+#include <
ma
ch/badge4.h>
#include "generic.h"
#include "generic.h"
@@
-206,7
+206,7
@@
static int __init badge4_init(void)
if (ret < 0)
printk(KERN_ERR
"%s: SA-1111 initialization failed (%d)\n",
if (ret < 0)
printk(KERN_ERR
"%s: SA-1111 initialization failed (%d)\n",
- __
FUNCTION
__, ret);
+ __
func
__, ret);
/* maybe turn on 5v0 from the start */
/* maybe turn on 5v0 from the start */
@@
-240,11
+240,11
@@
void badge4_set_5V(unsigned subsystem, int on)
/* detect on->off and off->on transitions */
if ((!old_5V_bitmap) && (badge4_5V_bitmap)) {
/* was off, now on */
/* detect on->off and off->on transitions */
if ((!old_5V_bitmap) && (badge4_5V_bitmap)) {
/* was off, now on */
- printk(KERN_INFO "%s: enabling 5V supply rail\n", __
FUNCTION
__);
+ printk(KERN_INFO "%s: enabling 5V supply rail\n", __
func
__);
GPSR = BADGE4_GPIO_PCMEN5V;
} else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) {
/* was on, now off */
GPSR = BADGE4_GPIO_PCMEN5V;
} else if ((old_5V_bitmap) && (!badge4_5V_bitmap)) {
/* was on, now off */
- printk(KERN_INFO "%s: disabling 5V supply rail\n", __
FUNCTION
__);
+ printk(KERN_INFO "%s: disabling 5V supply rail\n", __
func
__);
GPCR = BADGE4_GPIO_PCMEN5V;
}
GPCR = BADGE4_GPIO_PCMEN5V;
}
@@
-297,7
+297,6
@@
static void __init badge4_map_io(void)
}
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
}
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
- .phys_ram = 0xc0000000,
.phys_io = 0x80000000,
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.boot_params = 0xc0000100,
.phys_io = 0x80000000,
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.boot_params = 0xc0000100,
This page took
0.038587 seconds
and
5
git commands to generate.