diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-19 17:35:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-19 17:35:13 +1100 |
| commit | 569e2a76c879c6a7c052e16fc69f1a26db68d6a0 (patch) | |
| tree | 8f5f6562d03698483235af4274b82947162e6ee0 /drivers/staging/dream/Kconfig | |
| parent | 85117279003998c4a074de5de8dcb556450d0f22 (diff) | |
| parent | a614be9a8b28bdedd2778aa0b443dcee62443989 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
Diffstat (limited to 'drivers/staging/dream/Kconfig')
| -rw-r--r-- | drivers/staging/dream/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig deleted file mode 100644 index 52bd187de5a7..000000000000 --- a/drivers/staging/dream/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - - -config INPUT_GPIO - tristate "GPIO driver support" - help - Say Y here if you want to support gpio based keys, wheels etc... - - - |