ARM: OMAP: Manually merged drivers/Kconfig
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:39:40 +0000 (06:39 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:39:40 +0000 (06:39 -0700)
Manually merged drivers/Kconfig

drivers/Kconfig

diff --cc drivers/Kconfig
Simple merge