Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275341
b: refs/heads/master
c: 9f80d8b
h: refs/heads/master
i:
  275339: 89cf479
v: v3
  • Loading branch information
William Douglas authored and Linus Torvalds committed Nov 12, 2011
1 parent 1fe7c0a commit 123aa24
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 57e6319dd61d5ca10fe8dd57bcce8c0e2c480799
refs/heads/master: 9f80d8b68fb244bbd69c55aced663b91098544fc
1 change: 1 addition & 0 deletions trunk/arch/x86/platform/mrst/mrst.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ static void *msic_ocd_platform_data(void *info)
}

static const struct devs_id __initconst device_ids[] = {
{"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
{"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
{"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
Expand Down

0 comments on commit 123aa24

Please sign in to comment.