Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17670
b: refs/heads/master
c: 0863afb
h: refs/heads/master
v: v3
  • Loading branch information
Martin Waitz authored and Linus Torvalds committed Jan 10, 2006
1 parent c214f1f commit b71ecf4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 061350e7ecf869ed3c98d962b16a772e9674e283
refs/heads/master: 0863afb32b77fc89c7110b3d10fb048cb56bb1b5
4 changes: 2 additions & 2 deletions trunk/drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,
return count;
}

/**
* device_subsys - structure to be registered with kobject core.
/*
* devices_subsys - structure to be registered with kobject core.
*/

decl_subsys(devices, &ktype_device, &device_uevent_ops);
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/rio_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end)

/**
* RIO_DEVICE - macro used to describe a specific RIO device
* @vid: the 16 bit RIO vendor ID
* @did: the 16 bit RIO device ID
* @dev: the 16 bit RIO device ID
* @ven: the 16 bit RIO vendor ID
*
* This macro is used to create a struct rio_device_id that matches a
* specific device. The assembly vendor and assembly device fields
Expand Down
3 changes: 1 addition & 2 deletions trunk/include/sound/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
#ifdef CONFIG_SND_VERBOSE_PRINTK
/**
* snd_printd - debug printk
* @format: format string
* @fmt: format string
*
* Compiled only when Works like snd_printk() for debugging purpose.
* Ignored when CONFIG_SND_DEBUG is not set.
Expand All @@ -331,7 +331,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
/**
* snd_assert - run-time assertion macro
* @expr: expression
* @args...: the action
*
* This macro checks the expression in run-time and invokes the commands
* given in the rest arguments if the assertion is failed.
Expand Down

0 comments on commit b71ecf4

Please sign in to comment.