Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162560
b: refs/heads/master
c: 7dbefe3
h: refs/heads/master
v: v3
  • Loading branch information
Axel K authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 8fce623 commit 75e63e8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 25cf62e43110c43869a58505dae22ad5e2b1416a
refs/heads/master: 7dbefe3d581b6283c2ba70b292b450d3e2631f42
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rt3090/pci_main_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ MODULE_VERSION(STA_DRIVER_VERSION);
//
static struct pci_driver rt2860_driver =
{
name: "rt2860",
name: "rt3090",
id_table: rt2860_pci_tbl,
probe: rt2860_probe,
#if LINUX_VERSION_CODE >= 0x20412
Expand Down Expand Up @@ -326,9 +326,9 @@ static INT __devinit rt2860_probe(
}

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
print_name = pci_dev ? pci_name(pci_dev) : "rt2860";
print_name = pci_dev ? pci_name(pci_dev) : "rt3090";
#else
print_name = pci_dev ? pci_dev->slot_name : "rt2860";
print_name = pci_dev ? pci_dev->slot_name : "rt3090";
#endif // LINUX_VERSION_CODE //

if ((rv = pci_request_regions(pci_dev, print_name)) != 0)
Expand Down

0 comments on commit 75e63e8

Please sign in to comment.