Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303106
b: refs/heads/master
c: 8ebf148
h: refs/heads/master
v: v3
  • Loading branch information
Tushar Behera authored and Kukjin Kim committed May 12, 2012
1 parent 6ee2711 commit 11b39f6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 178e712601be883040abfca9186d969bb5c427f8
refs/heads/master: 8ebf148a6807c8a2c5a013b72fc834b739cc85be
26 changes: 5 additions & 21 deletions trunk/arch/arm/mach-s3c64xx/mach-crag6410.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,10 @@ static struct platform_device crag6410_gpio_keydev = {
};

static struct resource crag6410_dm9k_resource[] = {
[0] = {
.start = S3C64XX_PA_XM0CSN5,
.end = S3C64XX_PA_XM0CSN5 + 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = S3C64XX_PA_XM0CSN5 + (1 << 8),
.end = S3C64XX_PA_XM0CSN5 + (1 << 8) + 1,
.flags = IORESOURCE_MEM,
},
[2] = {
.start = S3C_EINT(17),
.end = S3C_EINT(17),
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
},
[0] = DEFINE_RES_MEM(S3C64XX_PA_XM0CSN5, 2),
[1] = DEFINE_RES_MEM(S3C64XX_PA_XM0CSN5 + (1 << 8), 2),
[2] = DEFINE_RES_NAMED(S3C_EINT(17), 1, NULL, IORESOURCE_IRQ \
| IORESOURCE_IRQ_HIGHLEVEL),
};

static struct dm9000_plat_data mini6410_dm9k_pdata = {
Expand All @@ -262,12 +251,7 @@ static struct platform_device crag6410_dm9k_device = {
};

static struct resource crag6410_mmgpio_resource[] = {
[0] = {
.name = "dat",
.start = S3C64XX_PA_XM0CSN4 + 1,
.end = S3C64XX_PA_XM0CSN4 + 1,
.flags = IORESOURCE_MEM,
},
[0] = DEFINE_RES_MEM_NAMED(S3C64XX_PA_XM0CSN4, 1, "dat"),
};

static struct platform_device crag6410_mmgpio = {
Expand Down

0 comments on commit 11b39f6

Please sign in to comment.