diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-08-27 05:22:49 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-08-28 01:53:12 -0400 |
commit | be8c129f1a853daac9085d81256c9d4bd38c6a11 (patch) | |
tree | 2f59e5571ba19f74cf5dd97367d66fdec8dd5547 /arch/sh | |
parent | c773d8af8ebccb723e9843c1e73840b2c5e00572 (diff) |
sh: update Migo-R defconfig
This patch updates the MigoR defconfig to include the recently merged
uio_pdrv_genirq driver.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/configs/migor_defconfig | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index c4b3e1d8950d..4f8b1974f2c7 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Wed Jul 30 01:44:41 2008 | 4 | # Tue Aug 26 14:18:17 2008 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -11,6 +11,7 @@ CONFIG_GENERIC_BUG=y | |||
11 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
12 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
14 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 16 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
16 | CONFIG_GENERIC_TIME=y | 17 | CONFIG_GENERIC_TIME=y |
@@ -21,7 +22,6 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 23 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
23 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 24 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
25 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 25 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
26 | 26 | ||
27 | # | 27 | # |
@@ -87,6 +87,7 @@ CONFIG_HAVE_OPROFILE=y | |||
87 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | 87 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set |
88 | CONFIG_HAVE_CLK=y | 88 | CONFIG_HAVE_CLK=y |
89 | CONFIG_PROC_PAGE_MONITOR=y | 89 | CONFIG_PROC_PAGE_MONITOR=y |
90 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
90 | CONFIG_SLABINFO=y | 91 | CONFIG_SLABINFO=y |
91 | CONFIG_RT_MUTEXES=y | 92 | CONFIG_RT_MUTEXES=y |
92 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
@@ -270,6 +271,7 @@ CONFIG_HZ=250 | |||
270 | # CONFIG_SCHED_HRTICK is not set | 271 | # CONFIG_SCHED_HRTICK is not set |
271 | # CONFIG_KEXEC is not set | 272 | # CONFIG_KEXEC is not set |
272 | # CONFIG_CRASH_DUMP is not set | 273 | # CONFIG_CRASH_DUMP is not set |
274 | CONFIG_SECCOMP=y | ||
273 | CONFIG_PREEMPT_NONE=y | 275 | CONFIG_PREEMPT_NONE=y |
274 | # CONFIG_PREEMPT_VOLUNTARY is not set | 276 | # CONFIG_PREEMPT_VOLUNTARY is not set |
275 | # CONFIG_PREEMPT is not set | 277 | # CONFIG_PREEMPT is not set |
@@ -294,10 +296,6 @@ CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on" | |||
294 | # | 296 | # |
295 | CONFIG_BINFMT_ELF=y | 297 | CONFIG_BINFMT_ELF=y |
296 | # CONFIG_BINFMT_MISC is not set | 298 | # CONFIG_BINFMT_MISC is not set |
297 | |||
298 | # | ||
299 | # Networking | ||
300 | # | ||
301 | CONFIG_NET=y | 299 | CONFIG_NET=y |
302 | 300 | ||
303 | # | 301 | # |
@@ -649,6 +647,7 @@ CONFIG_HW_RANDOM=y | |||
649 | CONFIG_I2C=y | 647 | CONFIG_I2C=y |
650 | CONFIG_I2C_BOARDINFO=y | 648 | CONFIG_I2C_BOARDINFO=y |
651 | # CONFIG_I2C_CHARDEV is not set | 649 | # CONFIG_I2C_CHARDEV is not set |
650 | CONFIG_I2C_HELPER_AUTO=y | ||
652 | 651 | ||
653 | # | 652 | # |
654 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
@@ -709,6 +708,7 @@ CONFIG_SSB_POSSIBLE=y | |||
709 | # CONFIG_MFD_CORE is not set | 708 | # CONFIG_MFD_CORE is not set |
710 | # CONFIG_MFD_SM501 is not set | 709 | # CONFIG_MFD_SM501 is not set |
711 | # CONFIG_HTC_PASIC3 is not set | 710 | # CONFIG_HTC_PASIC3 is not set |
711 | # CONFIG_MFD_TMIO is not set | ||
712 | 712 | ||
713 | # | 713 | # |
714 | # Multimedia devices | 714 | # Multimedia devices |
@@ -755,6 +755,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
755 | # CONFIG_USB is not set | 755 | # CONFIG_USB is not set |
756 | # CONFIG_USB_OTG_WHITELIST is not set | 756 | # CONFIG_USB_OTG_WHITELIST is not set |
757 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 757 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
758 | # CONFIG_USB_MUSB_HDRC is not set | ||
759 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
758 | 760 | ||
759 | # | 761 | # |
760 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 762 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -842,7 +844,10 @@ CONFIG_RTC_DRV_RS5C372=y | |||
842 | # | 844 | # |
843 | CONFIG_RTC_DRV_SH=y | 845 | CONFIG_RTC_DRV_SH=y |
844 | # CONFIG_DMADEVICES is not set | 846 | # CONFIG_DMADEVICES is not set |
845 | # CONFIG_UIO is not set | 847 | CONFIG_UIO=y |
848 | # CONFIG_UIO_PDRV is not set | ||
849 | CONFIG_UIO_PDRV_GENIRQ=y | ||
850 | # CONFIG_UIO_SMX is not set | ||
846 | 851 | ||
847 | # | 852 | # |
848 | # File systems | 853 | # File systems |