From 8f56bbd5fb5edc90bca81cb8552f92bed024d03b Mon Sep 17 00:00:00 2001 From: dmitry pervushin Date: Sat, 20 May 2006 15:00:14 -0700 Subject: [PATCH] --- yaml --- r: 26863 b: refs/heads/master c: ba1a051319dc2bec9f43b7cef11c6e5270107fd6 h: refs/heads/master i: 26861: 04c63b4240d2752c303d0df6553f56e374d10439 26859: b23fcfb46aa1610a3f8f247eaaabbb5ac55a802b 26855: ac3b1236e3abe949c405564b1200b582f4904cd6 26847: 84aa4549a2dcec2d0ee462c673b874547092acb5 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 81c6656d63f9..5eb1a3b788e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae0718f8e3fcfa3e4863f63db90d24bbec6b14a2 +refs/heads/master: ba1a051319dc2bec9f43b7cef11c6e5270107fd6 diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index 7a3f733051e9..1cea4a6799fe 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -338,18 +338,18 @@ static struct class spi_master_class = { * spi_alloc_master - allocate SPI master controller * @dev: the controller, possibly using the platform_bus * @size: how much driver-private data to preallocate; the pointer to this - * memory is in the class_data field of the returned class_device, + * memory is in the class_data field of the returned class_device, * accessible with spi_master_get_devdata(). * * This call is used only by SPI master controller drivers, which are the * only ones directly touching chip registers. It's how they allocate - * an spi_master structure, prior to calling spi_add_master(). + * an spi_master structure, prior to calling spi_register_master(). * * This must be called from context that can sleep. It returns the SPI * master structure on success, else NULL. * * The caller is responsible for assigning the bus number and initializing - * the master's methods before calling spi_add_master(); and (after errors + * the master's methods before calling spi_register_master(); and (after errors * adding the device) calling spi_master_put() to prevent a memory leak. */ struct spi_master * __init_or_module