[patch] fix .text.exit error in sonypi.c

From: Adrian Bunk (bunk@fs.tum.de)
Date: Thu Mar 27 2003 - 17:13:31 EST

The following .text.exit error is present in 2.4.1-pre6 (it seems to be
in 2.5.66, too):

<-- snip -->

...
drivers/char/char.o(.text+0x9a891): In function `sonypi_pm_callback':
: undefined reference to `local symbols in discarded section .text.exit'
drivers/char/char.o(.text+0x9a898): In function `sonypi_pm_callback':
: undefined reference to `local symbols in discarded section .text.exit'
...

<-- snip -->

In drivers/char/sonypi.c the __devexit funcitions sonypi_type1_dis and
sonypi_type2_dis are called from the non-__devexit function
sonypi_pm_callback.

The following patch removes the __devexit from these two functions:

--- linux-2.4.21-pre6-full-nohotplug/drivers/char/sonypi.c.old 2003-03-27 22:07:23.000000000 +0100
+++ linux-2.4.21-pre6-full-nohotplug/drivers/char/sonypi.c 2003-03-27 22:09:05.000000000 +0100
@@ -162,7 +162,7 @@
 }
 
 /* Disables the device - this comes from the AML code in the ACPI bios */
-static void __devexit sonypi_type1_dis(void) {
+static void sonypi_type1_dis(void) {
         u32 v;
 
         pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
@@ -174,7 +174,7 @@
         outl(v, SONYPI_IRQ_PORT);
 }
 
-static void __devexit sonypi_type2_dis(void) {
+static void sonypi_type2_dis(void) {
         if (ec_write(SONYPI_SHIB, 0))
                 printk(KERN_WARNING "ec_write failed\n");
         if (ec_write(SONYPI_SLOB, 0))

I've tested the compilation with 2.4.21-pre6.

Please apply
Adrian 

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:29 EST