Merge branch 'can/at91_can-for-net-2.6' of git://git.pengutronix.de/git/mkl/linux-2.6

[mv-sheeva.git] / drivers / nfc / pn544.c

diff --git a/drivers/nfc/pn544.c b/drivers/nfc/pn544.c
index 401c44b6eadb8220c726bb6511cf8ae8bca15000..bae647264dd66bba88492f59f1315c0464ce2e8f 100644 (file)
--- a/drivers/nfc/pn544.c
+++ b/drivers/nfc/pn544.c
@@ -69,7 +69,7 @@ struct pn544_info {
        struct mutex read_mutex; /* Serialize read_irq access */
        struct mutex mutex; /* Serialize info struct access */
        u8 *buf;
-       unsigned int buflen;
+       size_t buflen;
 };
 
 static const char reg_vdd_io[] = "Vdd_IO";