diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:48:18 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-12 23:48:18 +0100 |
| commit | a759012e5f9717a69c2c2f03d6c7fe435e150824 (patch) | |
| tree | 4b44266e68b2047fd676201bea70f6de39a647b3 /drivers/pnp/resource.c | |
| parent | Merge branches 'acpi-gpe', 'acpi-video', 'acpi-thermal', 'acpi-processor', 'a... (diff) | |
| parent | PNPBIOS: check return value of pnp_add_device() (diff) | |
| download | linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.tar.xz linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.zip | |
Merge branch 'pnp'
* pnp:
PNPBIOS: check return value of pnp_add_device()
PNP: Mark the function pnp_build_option() as static in resource.c
PNP / card: add missing put_device() call
PNPACPI: check return value of pnp_add_device()
Diffstat (limited to 'drivers/pnp/resource.c')
| -rw-r--r-- | drivers/pnp/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index d95e101ffb43..bacddd102ae9 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -31,7 +31,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 }; /* reserve (don't use) some * option registration */ -struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type, +static struct pnp_option *pnp_build_option(struct pnp_dev *dev, unsigned long type, unsigned int option_flags) { struct pnp_option *option; |