diff --git a/[refs] b/[refs] index d749d8cfc209..f1c0f74ba3a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a7cb69badb4ca11fe0ba09aafac5c284922fc8f +refs/heads/master: cda5265e7c5ba5f23c83f2f0693fef392b39e7e5 diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c index 5fb79f59040f..a85f5eb85585 100644 --- a/trunk/drivers/char/sx.c +++ b/trunk/drivers/char/sx.c @@ -2034,7 +2034,7 @@ static int sx_init_board (struct sx_board *board) } -static void printheader(void) +static void __devinit printheader(void) { static int header_printed; @@ -2047,7 +2047,7 @@ static void printheader(void) } -static int probe_sx (struct sx_board *board) +static int __devinit probe_sx (struct sx_board *board) { struct vpd_prom vpdp; char *p; @@ -2125,7 +2125,7 @@ static int probe_sx (struct sx_board *board) card. 0xe0000 and 0xf0000 are taken by the BIOS. That only leaves 0xc0000, 0xc8000, 0xd0000 and 0xd8000 . */ -static int probe_si (struct sx_board *board) +static int __devinit probe_si (struct sx_board *board) { int i; @@ -2364,7 +2364,7 @@ static void __exit sx_release_drivers(void) EEprom. As the bit is read/write for the CPU, we can fix it here, if we detect that it isn't set correctly. -- REW */ -static void fix_sx_pci (struct pci_dev *pdev, struct sx_board *board) +static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board) { unsigned int hwbase; void __iomem *rebase;