diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/misc/Kconfig | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index b6c045dc97b4..00db31c314e0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -30,6 +30,7 @@ config IBM_ASM | |||
| 30 | 30 | ||
| 31 | config SGI_IOC4 | 31 | config SGI_IOC4 |
| 32 | tristate "SGI IOC4 Base IO support" | 32 | tristate "SGI IOC4 Base IO support" |
| 33 | depends on PCI | ||
| 33 | ---help--- | 34 | ---help--- |
| 34 | This option enables basic support for the IOC4 chip on certain | 35 | This option enables basic support for the IOC4 chip on certain |
| 35 | SGI IO controller cards (IO9, IO10, and PCI-RT). This option | 36 | SGI IO controller cards (IO9, IO10, and PCI-RT). This option |