Messages in this thread Patch in this message | | | Date | Sun, 7 Mar 2004 19:53:49 -0800 | From | "Randy.Dunlap" <> | Subject | [PATCH] sonypi section usage |
| |
Hi Stelian,
Please apply to 2.6.current.
Thanks, -- ~Randy
// Linux 2.6.4-rc2 // sonypi_type[12]_srs() are called by sonypi_pm_callback() // so they shouldn't be marked as __devinit;
diffstat:= drivers/char/sonypi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff -Naurp ./drivers/char/sonypi.c~sonypi_init ./drivers/char/sonypi.c --- ./drivers/char/sonypi.c~sonypi_init 2004-02-17 19:58:47.000000000 -0800 +++ ./drivers/char/sonypi.c 2004-03-07 14:59:19.000000000 -0800 @@ -129,7 +129,7 @@ static int ec_read16(u8 addr, u16 *value } /* Initializes the device - this comes from the AML code in the ACPI bios */ -static void __devinit sonypi_type1_srs(void) { +static void sonypi_type1_srs(void) { u32 v; pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v); @@ -151,7 +151,7 @@ static void __devinit sonypi_type1_srs(v pci_write_config_dword(sonypi_device.dev, SONYPI_G10A, v); } -static void __devinit sonypi_type2_srs(void) { +static void sonypi_type2_srs(void) { if (sonypi_ec_write(SONYPI_SHIB, (sonypi_device.ioport1 & 0xFF00) >> 8)) printk(KERN_WARNING "ec_write failed\n"); if (sonypi_ec_write(SONYPI_SLOB, sonypi_device.ioport1 & 0x00FF)) - 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/
| |