diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/pnp/pnpbios/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/pnp/pnpbios/Makefile')
| -rw-r--r-- | drivers/pnp/pnpbios/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile index 3cd3ed760605..240b0ffb83ca 100644 --- a/drivers/pnp/pnpbios/Makefile +++ b/drivers/pnp/pnpbios/Makefile | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the kernel PNPBIOS driver. | 2 | # Makefile for the kernel PNPBIOS driver. |
| 3 | # | 3 | # |
| 4 | obj-y := pnp.o | ||
| 4 | 5 | ||
| 5 | pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o | 6 | pnp-y := core.o bioscalls.o rsparser.o |
| 6 | 7 | ||
| 7 | obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y) | 8 | pnp-$(CONFIG_PNPBIOS_PROC_FS) += proc.o |