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/Kconfig | |
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/Kconfig')
-rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d57150e..6ed84d8 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -115,8 +115,6 @@ source "drivers/staging/vme/Kconfig" source "drivers/staging/memrar/Kconfig" -source "drivers/staging/sep/Kconfig" - source "drivers/staging/iio/Kconfig" source "drivers/staging/zram/Kconfig" |