diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 18:48:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 18:48:16 +1100 |
| commit | 200789bb252bc57a4f04fad03236ce981eca9930 (patch) | |
| tree | d8f19d26028c3a48ad401660b630579cf3df0221 /arch/cris/Kconfig | |
| parent | d02519e9464d6510870cbd5ca7a44b37a4346fbf (diff) | |
| parent | 5ae1d8b04f3f7925f8f266cd51aa4bbeed84d782 (diff) | |
Merge branch 'quilt/staging'
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b17aeea8d620..3462245fe9fb 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -681,6 +681,8 @@ source "drivers/usb/Kconfig" source "drivers/uwb/Kconfig" +source "drivers/staging/Kconfig" + source "arch/cris/Kconfig.debug" source "security/Kconfig" |