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
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
neponset.c
diff --git
a/arch/arm/mach-sa1100/neponset.c
b/arch/arm/mach-sa1100/neponset.c
index
e3dc138
..
1405383
100644
(file)
--- a/
arch/arm/mach-sa1100/neponset.c
+++ b/
arch/arm/mach-sa1100/neponset.c
@@
-178,7
+178,7
@@
static int neponset_probe(struct device *dev)
/*
* LDM power management.
*/
/*
* LDM power management.
*/
-static int neponset_suspend(struct device *dev,
u32
state, u32 level)
+static int neponset_suspend(struct device *dev,
pm_message_t
state, u32 level)
{
/*
* Save state.
{
/*
* Save state.
@@
-266,6
+266,7
@@
static struct platform_device sa1111_device = {
static struct resource smc91x_resources[] = {
[0] = {
static struct resource smc91x_resources[] = {
[0] = {
+ .name = "smc91x-regs",
.start = SA1100_CS3_PHYS,
.end = SA1100_CS3_PHYS + 0x01ffffff,
.flags = IORESOURCE_MEM,
.start = SA1100_CS3_PHYS,
.end = SA1100_CS3_PHYS + 0x01ffffff,
.flags = IORESOURCE_MEM,
@@
-276,6
+277,7
@@
static struct resource smc91x_resources[] = {
.flags = IORESOURCE_IRQ,
},
[2] = {
.flags = IORESOURCE_IRQ,
},
[2] = {
+ .name = "smc91x-attrib",
.start = SA1100_CS3_PHYS + 0x02000000,
.end = SA1100_CS3_PHYS + 0x03ffffff,
.flags = IORESOURCE_MEM,
.start = SA1100_CS3_PHYS + 0x02000000,
.end = SA1100_CS3_PHYS + 0x03ffffff,
.flags = IORESOURCE_MEM,