diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-19 15:47:20 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-19 15:47:20 +0000 |
| commit | 805bb294632a8ace210dfc82e5c99488c95ecc05 (patch) | |
| tree | 29759b0523331a125565f72a733468ac8d8b03c8 | |
| parent | be570b857c1610b616a5a635f0fa233eab9ed242 (diff) | |
| parent | 5b1338edd3dd5f80120c2155ff56f157aeb921b9 (diff) | |
merge of '9eb0bfbe34d1258e15bdfdccaf57c8a5d5929847'
and 'd89e3ee233f10cca12a389232ec2f352a0472f76'
| -rw-r--r-- | packages/linux/linux-efika-2.6.21+git/defconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/linux/linux-efika-2.6.21+git/defconfig b/packages/linux/linux-efika-2.6.21+git/defconfig index d9cf66bb97..de271da67a 100644 --- a/packages/linux/linux-efika-2.6.21+git/defconfig +++ b/packages/linux/linux-efika-2.6.21+git/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20 -# Thu May 17 17:49:55 2007 +# Sat May 19 17:43:26 2007 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -186,7 +186,11 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0,9600 console=ttyPSC0,115200" -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_SOFTWARE_SUSPEND is not set CONFIG_SECCOMP=y CONFIG_ISA_DMA_API=y @@ -1151,6 +1155,7 @@ CONFIG_USB=y # CONFIG_USB_DEVICEFS=y CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set # @@ -1194,7 +1199,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set |