diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/pnp/system.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/pnp/system.c')
| -rw-r--r-- | drivers/pnp/system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c index 764f3a310685..59b90922da8c 100644 --- a/drivers/pnp/system.c +++ b/drivers/pnp/system.c | |||
| @@ -26,7 +26,7 @@ static void reserve_range(struct pnp_dev *dev, resource_size_t start, | |||
| 26 | resource_size_t end, int port) | 26 | resource_size_t end, int port) |
| 27 | { | 27 | { |
| 28 | char *regionid; | 28 | char *regionid; |
| 29 | const char *pnpid = dev->dev.bus_id; | 29 | const char *pnpid = dev_name(&dev->dev); |
| 30 | struct resource *res; | 30 | struct resource *res; |
| 31 | 31 | ||
| 32 | regionid = kmalloc(16, GFP_KERNEL); | 32 | regionid = kmalloc(16, GFP_KERNEL); |