diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-06 15:14:45 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-06 15:14:45 +0000 |
| commit | c5718e16d08d73a48642840dd8ad532734fb5942 (patch) | |
| tree | 9e793953076377647d4d86ba1e53c041cacf760f /packages/linux/linux-omap2-git/beagleboard/defconfig | |
| parent | 86acccc82f46060f45e78abd587c857c6f72986b (diff) | |
| parent | 09e038b5a358d364a95269a1aed5940a6b913471 (diff) | |
merge of '55132066284089ca5853bcbb50bbd4990ec25823'
and '5565cda387e227c33c34f8743f541e7737fc5b1b'
Diffstat (limited to 'packages/linux/linux-omap2-git/beagleboard/defconfig')
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 0adc452746..d01d473ed5 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Wed Jul 30 14:28:15 2008 +# Tue Aug 5 20:34:54 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -187,9 +187,8 @@ CONFIG_OMAP_BOOT_REASON=y CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MMU_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set -# CONFIG_OMAP_MPU_TIMER is not set -CONFIG_OMAP_32K_TIMER=y -CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set @@ -256,7 +255,7 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set -CONFIG_HZ=128 +CONFIG_HZ=100 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set @@ -859,6 +858,7 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y +# CONFIG_I2C2_OMAP_BEAGLE is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set |