Merge commit 'v2.6.26' into bkl-removal

[linux-2.6] / drivers / media / dvb / ttpci / ttpci-eeprom.c

diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c
index 18aa22b5478d654d15e37cddd7712c57bd09e609..7dd54b3026a251c9eb4ba7fbd69dc71fbdd8edb1 100644 (file)
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -13,7 +13,7 @@
     Holger Waechtler   Convergence
 
     Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de>
-                           Metzler Brothers Systementwicklung GbR
+                           Metzler Brothers Systementwicklung GbR
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -95,7 +95,7 @@ static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encode
                { .addr = 0x50, .flags = I2C_M_RD, .buf = encodedMAC, .len = 20 }
        };
 
-       /* dprintk("%s\n", __FUNCTION__); */
+       /* dprintk("%s\n", __func__); */
 
        ret = i2c_transfer(adapter, msg, 2);