Disabled software suspend on apus, cleaned up typoed entry in powerpc-miboot.

svn path=/dists/trunk/linux-2.6/; revision=5148
This commit is contained in:
Sven Luther 2005-12-30 09:35:41 +00:00
parent 0a6e7fb1dd
commit a0d39b3752
2 changed files with 2 additions and 1 deletions

View File

@ -1068,3 +1068,5 @@ CONFIG_NFS_ACL_SUPPORT=y
CONFIG_CRYPTO=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_SOFTWARE_SUSPEND is not set

View File

@ -71,7 +71,6 @@ CONFIG_PCMCIA_XIRTULIP=m
CONFIG_BROKEN_ON_SMP=y
CONFIG_CRYPTO_MD5=y
# CONFIG_SOFTWARE_SUSPEND is not set
ONFIG_SOFTWARE_SUSPEND=m
CONFIG_DEFAULT_DEADLINE=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_IOSCHED_NOOP=y