diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-25 13:28:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-25 13:28:55 -0400 |
| commit | 22e95ac87d62bdc65b8a694a23cd4a364689b013 (patch) | |
| tree | 5ac900300ad1d4a8d8118545e3e971862de70ea4 /net/rfkill/Makefile | |
| parent | 6b3678354647a653e669746c05765f05d2b90239 (diff) | |
| parent | 31ec97d9cebac804814de298592648f7c18d8281 (diff) | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/rfkill/Makefile')
| -rw-r--r-- | net/rfkill/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile index d9a5a58ffd8..311768783f4 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile | |||
| @@ -6,3 +6,4 @@ rfkill-y += core.o | |||
| 6 | rfkill-$(CONFIG_RFKILL_INPUT) += input.o | 6 | rfkill-$(CONFIG_RFKILL_INPUT) += input.o |
| 7 | obj-$(CONFIG_RFKILL) += rfkill.o | 7 | obj-$(CONFIG_RFKILL) += rfkill.o |
| 8 | obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o | 8 | obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o |
| 9 | obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o | ||