diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/isdn/sc/Kconfig | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/isdn/sc/Kconfig')
| -rw-r--r-- | drivers/isdn/sc/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig index e6510ca7bf43..7469863a7925 100644 --- a/drivers/isdn/sc/Kconfig +++ b/drivers/isdn/sc/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # | ||
| 2 | # Config.in for Spellcaster ISDN driver | ||
| 3 | # | ||
| 4 | config ISDN_DRV_SC | 1 | config ISDN_DRV_SC |
| 5 | tristate "Spellcaster support" | 2 | tristate "Spellcaster support" |
| 6 | depends on ISA | 3 | depends on ISA |
| @@ -9,4 +6,3 @@ config ISDN_DRV_SC | |||
| 9 | driver currently builds only in a modularized version. | 6 | driver currently builds only in a modularized version. |
| 10 | To build it, choose M here: the module will be called sc. | 7 | To build it, choose M here: the module will be called sc. |
| 11 | See <file:Documentation/isdn/README.sc> for more information. | 8 | See <file:Documentation/isdn/README.sc> for more information. |
| 12 | |||