[IA64] Manual merge fix for 3 files
[linux-2.6] / drivers / pnp / pnpbios / Kconfig
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2