Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164735
b: refs/heads/master
c: 5e763d2
h: refs/heads/master
i:
  164733: ce9442c
  164731: 887a957
  164727: 3959fed
  164719: 43f55a6
  164703: 4b8d660
  164671: d91c365
  164607: 3b7227b
v: v3
  • Loading branch information
Adrian Hunter authored and Linus Torvalds committed Sep 23, 2009
1 parent d0bffb4 commit 2dac260
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2bf08d643a244ccb9d9b70aff655340a0d98626
refs/heads/master: 5e763d2968148efafc352748b0ed598b1a695dad
4 changes: 4 additions & 0 deletions trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/regulator/machine.h>
#include <linux/gpio.h>
#include <linux/mmc/host.h>

#include <mach/mcspi.h>
#include <mach/mux.h>
Expand Down Expand Up @@ -102,13 +103,16 @@ static struct twl4030_hsmmc_info mmc[] = {
.cover_only = true,
.gpio_cd = 160,
.gpio_wp = -EINVAL,
.power_saving = true,
},
{
.name = "internal",
.mmc = 2,
.wires = 8,
.gpio_cd = -EINVAL,
.gpio_wp = -EINVAL,
.nonremovable = true,
.power_saving = true,
},
{} /* Terminator */
};
Expand Down

0 comments on commit 2dac260

Please sign in to comment.