diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-06-12 14:45:27 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-06-12 14:45:27 +0000 |
| commit | b1f4d34f8541f039d72d423223c91e32540a2fc5 (patch) | |
| tree | c50f34a595a58cb31a25d96727c3e2c9c27c0a91 /packages/linux/linux-rp-2.6.20 | |
| parent | 10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5 (diff) | |
| parent | b655c71aac44af6eab2a52774ea810a945592cee (diff) | |
merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'
and '8dfee9b2427785432e4161eb7cc749155230e08e'
Diffstat (limited to 'packages/linux/linux-rp-2.6.20')
| -rw-r--r-- | packages/linux/linux-rp-2.6.20/defconfig-collie | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index 945f2fb39c..1c6c0be8cc 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -254,7 +254,7 @@ CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=m +CONFIG_APM=y # # Networking @@ -1394,7 +1394,7 @@ CONFIG_USB_EZUSB=y # # USB Gadget Support # -CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set |