diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-02 00:00:40 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-02 00:00:40 +0000 |
| commit | 342be6a73e841f839fabd7c5bbf589b0d925e334 (patch) | |
| tree | 4be247e652124d62c7c858f5f1e11abeb993d86e /packages/linux | |
| parent | 0e1504b64afdde10de084393d1c2feac6b3ea98b (diff) | |
| parent | a4564f871d82cd74c7cabee88855658b435e5bb6 (diff) | |
merge of '3c603fa45cf43613ab6041072798d5fbe162e6f3'
and 'b125865ca3f9be3fcd9bd2cf94915c3b0ac3f070'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-handhelds-2.6/h2200/defconfig | 53 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_cvs.bb | 2 |
2 files changed, 11 insertions, 44 deletions
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index a41c6b6586..8decacd4a2 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17-hh2 -# Fri Oct 27 01:17:24 2006 +# Wed Nov 1 20:06:18 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -1022,22 +1022,27 @@ CONFIG_H2200_BATTERY=y # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers # +# CONFIG_LEDS_H2200 is not set # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y # # Multimedia devices # CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_VIDEO_V4L1 is not set +# CONFIG_VIDEO_V4L1_COMPAT is not set CONFIG_VIDEO_V4L2=y # @@ -1049,13 +1054,9 @@ CONFIG_VIDEO_V4L2=y # # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_VIVI is not set -CONFIG_VIDEO_CPIA=m -# CONFIG_VIDEO_CPIA_USB is not set # CONFIG_VIDEO_CPIA2 is not set -# CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set # # Encoders and Decoders @@ -1073,24 +1074,10 @@ CONFIG_VIDEO_CPIA=m # # V4L USB devices # -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -CONFIG_USB_SN9C102=m -# CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_ZC0301 is not set -CONFIG_USB_PWC=m # # Radio Adapters # -# CONFIG_RADIO_MAESTRO is not set # # Digital Video Broadcasting Devices @@ -1382,27 +1369,7 @@ CONFIG_MMC_SAMCOP=y # Real Time Clock # CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y - -# -# RTC drivers -# -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_M48T86 is not set -CONFIG_RTC_DRV_SA1100=y -# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_CLASS is not set # # File systems diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index e0aeff7c3f..62c0fad9c9 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -26,7 +26,7 @@ ALLOW_EMPTY_htcuniversal = 1 K_MAJOR = "2" K_MINOR = "6" K_MICRO = "17" -HHV = "1" +HHV = "2" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" |