diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-08-26 20:11:25 (GMT) |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2010-08-26 20:11:25 (GMT) |
| commit | 0a2f38193d60edd22f9e06e31ea8db791d42b3e0 (patch) | |
| tree | 9734f14a4ef5b3e620c68eee1028ac5bee032671 /drivers/staging/Makefile | |
| parent | 4684fe01c7a64d24b0e39d033a02d4c2d2cbc256 (diff) | |
| parent | d4348c678977c7093438bbbf2067c49396ae941b (diff) | |
| download | linux-fsl-qoriq-0a2f38193d60edd22f9e06e31ea8db791d42b3e0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index af88a5c..8a37fef 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -39,7 +39,6 @@ obj-$(CONFIG_FB_UDL) += udlfb/ obj-$(CONFIG_HYPERV) += hv/ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/ -obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/ obj-$(CONFIG_ZRAM) += zram/ obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ |