diff options
| author | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-30 16:06:54 -0500 |
|---|---|---|
| committer | Daniel Schaeffer <daniel@dschaeffer.localdomain> | 2008-01-30 16:06:54 -0500 |
| commit | 181396da6285355076be1c4476be6c14d6f38d54 (patch) | |
| tree | df42c920e99e91362f481295f73891d8c5669e4c | |
| parent | 648b932d8cf61f38d08a84e6388036b22766c2df (diff) | |
Fixed Kconfig merge error
On branch 2.6.23-imx27
Changes to be committed:
modified: arch/arm/mach-mx3/Kconfig
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index 990d40ad4cdb..e7500eb4002f 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig @@ -63,4 +63,6 @@ config I2C_MXC_SELECT3 endmenu +endmenu + |