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/isapnp | |
| parent | 633379a0f9f16362835d7a3fde141d3a95fd6c97 (diff) | |
| parent | cdefba03e44bd3b3311a3849a81ec7030dfa1519 (diff) | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/isapnp')
| -rw-r--r-- | drivers/pnp/isapnp/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/isapnp/Makefile b/drivers/pnp/isapnp/Makefile index cac18bbfb817..6e607aa33aa3 100644 --- a/drivers/pnp/isapnp/Makefile +++ b/drivers/pnp/isapnp/Makefile | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the kernel ISAPNP driver. | 2 | # Makefile for the kernel ISAPNP driver. |
| 3 | # | 3 | # |
| 4 | obj-y += pnp.o | ||
| 5 | pnp-y := core.o compat.o | ||
| 4 | 6 | ||
| 5 | isapnp-proc-$(CONFIG_PROC_FS) = proc.o | 7 | pnp-$(CONFIG_PROC_FS) += proc.o |
| 6 | |||
| 7 | obj-y := core.o compat.o $(isapnp-proc-y) | ||