summaryrefslogtreecommitdiffstats
path: root/arch/um/Kconfig.common
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'timers-core-for-linus' of ↵Linus Torvalds2012-05-241-4/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer updates from Thomas Gleixner. Various trivial conflict fixups in arch Kconfig due to addition of unrelated entries nearby. And one slightly more subtle one for sparc32 (new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas. * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) timekeeping: Fix a few minor newline issues. time: remove obsolete declaration ntp: Fix a stale comment and a few stray newlines. ntp: Correct TAI offset during leap second timers: Fixup the Kconfig consolidation fallout x86: Use generic time config unicore32: Use generic time config um: Use generic time config tile: Use generic time config sparc: Use: generic time config sh: Use generic time config score: Use generic time config s390: Use generic time config openrisc: Use generic time config powerpc: Use generic time config mn10300: Use generic time config mips: Use generic time config microblaze: Use generic time config m68k: Use generic time config m32r: Use generic time config ...
| * um: Use generic time configAnna-Maria Gleixner2012-05-211-4/+1
| | | | | | | | | | | | | | Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de> Acked-by: Richard Weinberger <richard@nod.at> Link: http://lkml.kernel.org/r/20120518163107.251597655@glx-um.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* | um: Remove CONFIG_IRQ_RELEASE_METHODRichard Weinberger2012-05-211-5/+0
|/ | | | | | | UML does no longer need CONFIG_IRQ_RELEASE_METHOD. Signed-off-by: Richard Weinberger <richard@nod.at> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
* um: Wire CONFIG_GENERIC_IO upRichard Weinberger2012-03-251-0/+1
| | | | | | | UML has no io memory but implements everything defined in generic-asm/io.h. Signed-off-by: Richard Weinberger <richard@nod.at>
* cpu: Register a generic CPU device on architectures that currently do notBen Hutchings2012-01-111-0/+1
| | | | | | | | | | | | | frv, h8300, m68k, microblaze, openrisc, score, um and xtensa currently do not register a CPU device. Add the config option GENERIC_CPU_DEVICES which causes a generic CPU device to be registered for each present CPU, and make all these architectures select it. Richard Weinberger <richard@nod.at> covered UML and suggested using per_cpu. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* genirq: Remove the now obsolete config options and select statementsThomas Gleixner2011-03-301-1/+0
| | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* um: Use generic show_interrupts()Thomas Gleixner2011-03-241-0/+1
| | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* um: Select GENERIC_HARDIRQS_NO_DEPRECATEDThomas Gleixner2011-02-141-0/+1
| | | | | | | | | irq chips converted and proper accessor functions used. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jeff Dike <jdike@addtoit.com> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <20110206224515.430825903@linutronix.de>
* um: Use generic irq KconfigThomas Gleixner2011-01-211-5/+1
| | | | | | | | No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jeff Dike <jdike@addtoit.com>
* Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2010-10-121-4/+0
|\ | | | | | | We need to revert the temporary hack in 71ebc01, hence the merge.
| * time: Kill off CONFIG_GENERIC_TIMEJohn Stultz2010-07-271-4/+0
| | | | | | | | | | | | | | | | | | | | Now that all arches have been converted over to use generic time via clocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME config option and simplify the generic code. Signed-off-by: John Stultz <johnstul@us.ibm.com> LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* | kbuild: migrate all arch to the kconfig mainmenu upgradeArnaud Lacombe2010-09-191-2/+0
|/ | | | | | Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Michal Marek <mmarek@suse.cz>
* x86, um: get rid of arch/um/Kconfig.archAl Viro2008-10-221-0/+77
Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile is allowed to say Kconfig := <whatever I want instead of arch/blah/Kconfig>. Rewrite arch/um/Kconfig and arch/um/Kconfig.<subarch> so that the latter would be top-level one (and include the pieces of the former). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
OpenPOWER on IntegriCloud