diff --git a/[refs] b/[refs] index c84b27b5a9f9..0bfbed2bcf52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c209fe9b0eb0bf0db09f55d83c101fc06bce152 +refs/heads/master: ecc73a99e4fe593e03b0d45f6121e952fc928eef diff --git a/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c b/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c index 5ca3d41a932d..7de35ccffd32 100644 --- a/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c +++ b/trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c @@ -214,7 +214,7 @@ static int cyasdevice_initialize(void) cy_as_dev = cy_as_hal_alloc(sizeof(cyasdevice)); if (cy_as_dev == NULL) { cy_as_hal_print_message("<1>_cy_as_device: " - "memmory allocation failed\n"); + "memory allocation failed\n"); return -ENOMEM; } memset(cy_as_dev, 0, sizeof(cyasdevice));