diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-28 21:33:10 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-05-28 21:33:10 +0000 |
| commit | c59b7a4ec6a0e72b37a1fdc65db3b68bc7a031b4 (patch) | |
| tree | 9cb42fbec3ded156116977b6a66face094e30e6b /packages/linux/linux-handhelds-2.6/htcuniversal | |
| parent | d90970113fa68349b85f42b768922611f1ff82e9 (diff) | |
| parent | f2abfe38b5dc02c84d2bac07d63e1286911753f6 (diff) | |
merge of '5e3a99cc75e7a19b9e1a2202770d36f7bb244ed3'
and '964ce234ef1d5dd431f00bd022f11812fa77f370'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/htcuniversal')
| -rw-r--r-- | packages/linux/linux-handhelds-2.6/htcuniversal/defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig index 13b07666d1..8fd7a11717 100644 --- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh4 -# Fri May 25 06:29:00 2007 +# Linux kernel version: 2.6.21-hh5 +# Mon May 28 20:35:31 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -257,6 +257,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="keepinitrd" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +# CONFIG_TXTOFFSET_DELTA is not set # # CPU Frequency scaling @@ -1081,7 +1082,7 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=y -# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set |