diff options
author | Brent Casavant <bcasavan@sgi.com> | 2006-04-20 15:38:16 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-04-21 10:59:00 -0700 |
commit | c1311af12c7ca176a790a911a3fb6fed1f3bb387 (patch) | |
tree | 031aaa768524d72a2863195a6b9d562e01af6d14 | |
parent | e5ecc192dfc5e0b325dd8c99ce4c755714c9acbf (diff) | |
download | linux-stable-c1311af12c7ca176a790a911a3fb6fed1f3bb387.tar.gz linux-stable-c1311af12c7ca176a790a911a3fb6fed1f3bb387.tar.bz2 linux-stable-c1311af12c7ca176a790a911a3fb6fed1f3bb387.zip |
[IA64] IOC4 config option ordering
SERIAL_SGI_IOC4 and BLK_DEV_SGIIOC4 depend upon SGI_IOC4, and
SERIAL_SGI_IOC3 depends upon SGI_IOC3. Currently the definitions
are out of order in the config sequence.
Fix by including drivers/sn/Kconfig immediately after SGI_SN,
upon which SGI_IOC4 and SGI_IOC3 depend.
Signed-off-by: Brent Casavant <bcasavan@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f40eeff0b5c..0f3076a820c3 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -413,6 +413,8 @@ config IA64_PALINFO config SGI_SN def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) +source "drivers/sn/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt" diff --git a/drivers/Kconfig b/drivers/Kconfig index 5c91d6afb117..aeb5ab2391e4 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -68,8 +68,6 @@ source "drivers/leds/Kconfig" source "drivers/infiniband/Kconfig" -source "drivers/sn/Kconfig" - source "drivers/edac/Kconfig" source "drivers/rtc/Kconfig" |