4 Commits

Author	SHA1	Message	Date
Arnd Bergmann	5b02ee3d21	asm-generic: merge branch 'master' of torvalds/linux-2.6 ... Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de>	2009-06-12 11:32:58 +02:00
Arnd Bergmann	d7c4f1b78a	asm-generic: make pci.h usable directly ... Some generic code is using the horribly misnamed PCI_DMA_BUS_IS_PHYS from asm/pci.h. This makes sure that an architecture without PCI support does not have to define this itself but can rely on the asm-generic version. Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>	2009-06-11 21:02:22 +02:00
Stoyan Gaydarov	db5c444eeb	FRV: BUG to BUG_ON changes ... Change some BUG()'s to BUG_ON()'s. Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2009-06-11 09:01:26 -07:00
David Howells	e69cc92788	FRV: Move to arch/frv/include/asm/ ... Move arch headers from include/asm-frv/ to arch/frv/include/asm/. Signed-off-by: David Howells <dhowells@redhat.com>	2009-04-10 01:48:06 +01:00