diff options
-rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 2 | ||||
-rw-r--r-- | drivers/pnp/card.c | 3 | ||||
-rw-r--r-- | drivers/pnp/manager.c | 1 | ||||
-rw-r--r-- | fs/sysfs/file.c | 5 | ||||
-rw-r--r-- | mm/memory.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index bb6a0106be11..d650ce36485f 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -266,7 +266,7 @@ X!Ekernel/module.c | |||
266 | <chapter id="hardware"> | 266 | <chapter id="hardware"> |
267 | <title>Hardware Interfaces</title> | 267 | <title>Hardware Interfaces</title> |
268 | <sect1><title>Interrupt Handling</title> | 268 | <sect1><title>Interrupt Handling</title> |
269 | !Iarch/i386/kernel/irq.c | 269 | !Ikernel/irq/manage.c |
270 | </sect1> | 270 | </sect1> |
271 | 271 | ||
272 | <sect1><title>Resources Management</title> | 272 | <sect1><title>Resources Management</title> |
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 3252662958d3..add12f7c489a 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
@@ -259,7 +259,6 @@ int pnp_add_card_device(struct pnp_card * card, struct pnp_dev * dev) | |||
259 | 259 | ||
260 | /** | 260 | /** |
261 | * pnp_remove_card_device- removes a device from the specified card | 261 | * pnp_remove_card_device- removes a device from the specified card |
262 | * @card: pointer to the card to remove from | ||
263 | * @dev: pointer to the device to remove | 262 | * @dev: pointer to the device to remove |
264 | */ | 263 | */ |
265 | 264 | ||
@@ -274,7 +273,7 @@ void pnp_remove_card_device(struct pnp_dev * dev) | |||
274 | 273 | ||
275 | /** | 274 | /** |
276 | * pnp_request_card_device - Searches for a PnP device under the specified card | 275 | * pnp_request_card_device - Searches for a PnP device under the specified card |
277 | * @lcard: pointer to the card link, cannot be NULL | 276 | * @clink: pointer to the card link, cannot be NULL |
278 | * @id: pointer to a PnP ID structure that explains the rules for finding the device | 277 | * @id: pointer to a PnP ID structure that explains the rules for finding the device |
279 | * @from: Starting place to search from. If NULL it will start from the begining. | 278 | * @from: Starting place to search from. If NULL it will start from the begining. |
280 | */ | 279 | */ |
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 65ecef738537..6c510c19ad7d 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
@@ -390,6 +390,7 @@ fail: | |||
390 | * pnp_manual_config_dev - Disables Auto Config and Manually sets the resource table | 390 | * pnp_manual_config_dev - Disables Auto Config and Manually sets the resource table |
391 | * @dev: pointer to the desired device | 391 | * @dev: pointer to the desired device |
392 | * @res: pointer to the new resource config | 392 | * @res: pointer to the new resource config |
393 | * @mode: 0 or PNP_CONFIG_FORCE | ||
393 | * | 394 | * |
394 | * This function can be used by drivers that want to manually set thier resources. | 395 | * This function can be used by drivers that want to manually set thier resources. |
395 | */ | 396 | */ |
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index e9cfa39f4099..d72c1ce48559 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #define to_subsys(k) container_of(k,struct subsystem,kset.kobj) | 14 | #define to_subsys(k) container_of(k,struct subsystem,kset.kobj) |
15 | #define to_sattr(a) container_of(a,struct subsys_attribute,attr) | 15 | #define to_sattr(a) container_of(a,struct subsys_attribute,attr) |
16 | 16 | ||
17 | /** | 17 | /* |
18 | * Subsystem file operations. | 18 | * Subsystem file operations. |
19 | * These operations allow subsystems to have files that can be | 19 | * These operations allow subsystems to have files that can be |
20 | * read/written. | 20 | * read/written. |
@@ -192,8 +192,9 @@ fill_write_buffer(struct sysfs_buffer * buffer, const char __user * buf, size_t | |||
192 | 192 | ||
193 | /** | 193 | /** |
194 | * flush_write_buffer - push buffer to kobject. | 194 | * flush_write_buffer - push buffer to kobject. |
195 | * @file: file pointer. | 195 | * @dentry: dentry to the attribute |
196 | * @buffer: data buffer for file. | 196 | * @buffer: data buffer for file. |
197 | * @count: number of bytes | ||
197 | * | 198 | * |
198 | * Get the correct pointers for the kobject and the attribute we're | 199 | * Get the correct pointers for the kobject and the attribute we're |
199 | * dealing with, then call the store() method for the attribute, | 200 | * dealing with, then call the store() method for the attribute, |
diff --git a/mm/memory.c b/mm/memory.c index 30975ef48722..c256175742ac 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1458,7 +1458,7 @@ restart: | |||
1458 | * unmap_mapping_range - unmap the portion of all mmaps | 1458 | * unmap_mapping_range - unmap the portion of all mmaps |
1459 | * in the specified address_space corresponding to the specified | 1459 | * in the specified address_space corresponding to the specified |
1460 | * page range in the underlying file. | 1460 | * page range in the underlying file. |
1461 | * @address_space: the address space containing mmaps to be unmapped. | 1461 | * @mapping: the address space containing mmaps to be unmapped. |
1462 | * @holebegin: byte in first page to unmap, relative to the start of | 1462 | * @holebegin: byte in first page to unmap, relative to the start of |
1463 | * the underlying file. This will be rounded down to a PAGE_SIZE | 1463 | * the underlying file. This will be rounded down to a PAGE_SIZE |
1464 | * boundary. Note that this is different from vmtruncate(), which | 1464 | * boundary. Note that this is different from vmtruncate(), which |