diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-09-08 06:07:20 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-09-08 06:07:20 +0000 |
| commit | 078763a440425b9b9a0862e6ecabdf1c1af35def (patch) | |
| tree | 80e4caca405a3b94eb893b462312e41708ba0659 /packages/linux | |
| parent | fbe2d6775362947d2aa59f27c3ab190997d10c02 (diff) | |
| parent | 313ea062889aba322b75726d8bb7276665aa4ea3 (diff) | |
merge of '79b90d4ef7df69035b001466908501f67f8aac76'
and '81a14649e513b12b58d75276170ffa386580f244'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-2.6.25/at32stk1000/defconfig | 12 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.25.bb | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index 66a1a789b3..c5f75a04d6 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Sat Jul 5 12:40:54 2008 +# Sun Sep 7 18:10:04 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -136,8 +136,8 @@ CONFIG_BOARD_ATSTK1002=y # CONFIG_BOARD_ATSTK1006 is not set # CONFIG_BOARD_ATSTK100X_CUSTOM is not set # CONFIG_BOARD_ATSTK100X_SPI1 is not set -# CONFIG_BOARD_ATSTK1000_J2_LED is not set -# CONFIG_BOARD_ATSTK1000_J2_LED8 is not set +CONFIG_BOARD_ATSTK1000_J2_LED=y +CONFIG_BOARD_ATSTK1000_J2_LED8=y # CONFIG_BOARD_ATSTK1000_J2_RGB is not set CONFIG_BOARD_ATSTK1000_EXTDAC=y # CONFIG_BOARD_ATSTK100X_ENABLE_AC97 is not set @@ -199,7 +199,8 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set -# CONFIG_CPU_FREQ_STAT is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=n CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -592,6 +593,7 @@ CONFIG_INPUT_POLLDEV=y # Userland interfaces # CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_VMS=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 @@ -1366,7 +1368,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set +CONFIG_TIMER_STATS=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 41f11d2c87..c84cbe8180 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r4" +PR = "r5" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" |