Merge branch 'mn10300' (mn10300 fixes from David Howells)

Browse source

Merge mn10300 fixes from David Howells.

* emailed patches from David Howells <dhowells@redhat.com>:
  MN10300: Need pci_iomap() and __pci_ioport_map() defining
  MN10300: ASB2305's PCI code needs the definition of XIRQ1
  MN10300: Enable IRQs more in system call exit work path
  MN10300: Fix ret_from_kernel_thread

...

This commit is contained in:

Linus Torvalds 2013-05-30 13:39:01 +09:00

parent 7b55eab81e 1aeeac7ad4

commit dcdbe33add

3 changed files with 9 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/mn10300/include/asm/pci.h

View file

19

arch/mn10300/kernel/entry.S

View file

1

arch/mn10300/unit-asb2305/pci.c

View file