diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
| commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
| tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /drivers/pnp/resource.c | |
| parent | ARM: clocksource: Add support for MOXA ART SoCs (diff) | |
| parent | proc: return on proc_readdir error (diff) | |
| download | linux-fac778a2b8d6ca953d440baeee72901c2dd5aad9.tar.xz linux-fac778a2b8d6ca953d440baeee72901c2dd5aad9.zip | |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/pnp/resource.c')
| -rw-r--r-- | drivers/pnp/resource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 3e6db1c1dc29..d95e101ffb43 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -515,6 +515,7 @@ struct pnp_resource *pnp_add_resource(struct pnp_dev *dev, } pnp_res->res = *res; + pnp_res->res.name = dev->name; dev_dbg(&dev->dev, "%pR\n", res); return pnp_res; } |