diff --git a/[refs] b/[refs] index ca51566e229d..13500c5d5713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 864d296cf948aef0fa32b81407541572583f7572 +refs/heads/master: 9b373ed18f745bddf4288f1ec4a51fe822b8610a diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c index 5fe75026ecc2..92df322e0b57 100644 --- a/trunk/arch/x86/pci/common.c +++ b/trunk/arch/x86/pci/common.c @@ -246,13 +246,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { }, }, #endif /* __i386__ */ - { - .callback = find_sort_method, - .ident = "Dell System", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), - }, - }, { .callback = set_bf_sort, .ident = "Dell PowerEdge 1950", @@ -293,6 +286,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R900"), }, }, + { + .callback = find_sort_method, + .ident = "Dell System", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + }, + }, { .callback = set_bf_sort, .ident = "HP ProLiant BL20p G3",