A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
  m68k: Define sigcontext ABI of ColdFire
  m68knommu: NPTL support for uClinux
  m68k: Add NPTL support
  m68k: Eliminate unused variable in page_to_phys()
  m68k: Switch to generic siginfo layout
  macfb: fix 24-bit visual and stuff
  macfb: cleanup
  fbdev: add some missing mac modes
  mac68k: start CUDA early
  valkyriefb: various fixes
  fbdev: mac_var_to_mode() fix
  mac68k: move macsonic and macmace platform devices
  mac68k: move mac_esp platform device
  mac68k: replace mac68k SCC code with platform device
  pmac-zilog: add platform driver
  pmac-zilog: cleanup
  mac68k: rework SWIM platform device
  mac68k: cleanup
  ataflop: Killl warning about unused variable flags
  m68k: Use DIV_ROUND_CLOSEST
  ...
This commit is contained in:
Linus Torvalds 2010-02-27 16:22:47 -08:00
commit 847f9c606c
48 changed files with 1111 additions and 1436 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/char/vme_scc.c
View file

@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops = {
* vme_scc_init() and support functions
*---------------------------------------------------------------------------*/
static int scc_init_drivers(void)
static int __init scc_init_drivers(void)
{
int error;
@ -172,7 +172,7 @@ static int scc_init_drivers(void)
/* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for ttyS1).
*/
static void scc_init_portstructs(void)
static void __init scc_init_portstructs(void)
{
struct scc_port *port;
int i;
@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
#ifdef CONFIG_MVME147_SCC
static int mvme147_scc_init(void)
static int __init mvme147_scc_init(void)
{
struct scc_port *port;
int error;
@ -298,7 +298,7 @@ fail:
#ifdef CONFIG_MVME162_SCC
static int mvme162_scc_init(void)
static int __init mvme162_scc_init(void)
{
struct scc_port *port;
int error;
@ -404,7 +404,7 @@ fail:
#ifdef CONFIG_BVME6000_SCC
static int bvme6000_scc_init(void)
static int __init bvme6000_scc_init(void)
{
struct scc_port *port;
int error;
@ -503,7 +503,7 @@ fail_free_b_rx:
#endif
static int vme_scc_init(void)
static int __init vme_scc_init(void)
{
int res = -ENODEV;