dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3

Browse Source
This commit is contained in:
Mark Brown
2011-12-13 00:19:20 +08:00
parent 0604ca48f1 8ab3069182
commit 68556ca1e0
727 changed files with 9361 additions and 6394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/firmware/dmi_scan.c
+2 -4
View File
@@ -585,14 +585,12 @@ int dmi_name_in_serial(const char *str)
}
/**
* dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information.
* dmi_name_in_vendors - Check if string is in the DMI system or board vendor name
* @str: Case sensitive Name
*/
int dmi_name_in_vendors(const char *str)
{
static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR,
DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR,
DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE };
static int fields[] = { DMI_SYS_VENDOR, DMI_BOARD_VENDOR, DMI_NONE };
int i;
for (i = 0; fields[i] != DMI_NONE; i++) {
int f = fields[i];