git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
idp.c
diff --git
a/arch/arm/mach-pxa/idp.c
b/arch/arm/mach-pxa/idp.c
index 01a83ab09ac340a8f7fadb0792a948c067c93e08..6914d22bc20fbfb0b19c8eba67f48e0e85ef83ad 100644
(file)
--- a/
arch/arm/mach-pxa/idp.c
+++ b/
arch/arm/mach-pxa/idp.c
@@
-18,7
+18,8
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <linux/device.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
#include <linux/fb.h>
#include <asm/setup.h>
#include <linux/fb.h>
#include <asm/setup.h>
@@
-183,7
+184,6
@@
static void __init idp_map_io(void)
MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
/* Maintainer: Vibren Technologies */
MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
/* Maintainer: Vibren Technologies */
- .phys_ram = 0xa0000000,
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = idp_map_io,
.phys_io = 0x40000000,
.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = idp_map_io,