diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/wavelan/Makefile | |
parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/wavelan/Makefile')
-rw-r--r-- | drivers/staging/wavelan/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/wavelan/Makefile b/drivers/staging/wavelan/Makefile new file mode 100644 index 000000000000..1cde17c69a43 --- /dev/null +++ b/drivers/staging/wavelan/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_WAVELAN) += wavelan.o +obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan_cs.o |