diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:59:44 -0500 |
| commit | 6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (patch) | |
| tree | 5b0ddc0eb897435f9fade4c4b5927f777ca23707 /drivers/pnp/pnpacpi | |
| parent | 633379a0f9f16362835d7a3fde141d3a95fd6c97 (diff) | |
| parent | cdefba03e44bd3b3311a3849a81ec7030dfa1519 (diff) | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/pnpacpi')
| -rw-r--r-- | drivers/pnp/pnpacpi/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile index 905326fcca85..40c93da18252 100644 --- a/drivers/pnp/pnpacpi/Makefile +++ b/drivers/pnp/pnpacpi/Makefile | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the kernel PNPACPI driver. | 2 | # Makefile for the kernel PNPACPI driver. |
| 3 | # | 3 | # |
| 4 | obj-y += pnp.o | ||
| 4 | 5 | ||
| 5 | obj-y := core.o rsparser.o | 6 | pnp-y := core.o rsparser.o |