X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=sound%2Fdrivers%2Fportman2x4.c;h=0eb9b5cebfcdefb44546a06a86fdd3ed4584b70c;hb=f563d53c30f3e60cde3a194cc1a87284ee0b3366;hp=b2d0ba4bd184073ad5b07fa2a2f25a7c81d1cc1a;hpb=f99c6bb6e2e9c35bd3dc0b1d0faa28bd6970930d;p=linux-2.6-omap-h63xx.git

diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index b2d0ba4bd18..0eb9b5cebfc 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -676,13 +676,13 @@ static void __devinit snd_portman_attach(struct parport *p)
 	struct platform_device *device;
 
 	device = platform_device_alloc(PLATFORM_DRIVER, device_count);
-	if (!device) 
+	if (!device)
 		return;
 
 	/* Temporary assignment to forward the parport */
 	platform_set_drvdata(device, p);
 
-	if (platform_device_register(device) < 0) {
+	if (platform_device_add(device) < 0) {
 		platform_device_put(device);
 		return;
 	}
@@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = {
 /*********************************************************************
  * module init stuff
  *********************************************************************/
-static void __init_or_module snd_portman_unregister_all(void)
+static void snd_portman_unregister_all(void)
 {
 	int i;