git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
isdn
/
i4l
/
isdn_ppp.c
diff --git
a/drivers/isdn/i4l/isdn_ppp.c
b/drivers/isdn/i4l/isdn_ppp.c
index
9187422
..
119412d
100644
(file)
--- a/
drivers/isdn/i4l/isdn_ppp.c
+++ b/
drivers/isdn/i4l/isdn_ppp.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/isdn.h>
#include <linux/poll.h>
#include <linux/ppp-comp.h>
#include <linux/isdn.h>
#include <linux/poll.h>
#include <linux/ppp-comp.h>
@@
-668,7
+667,7
@@
isdn_ppp_poll(struct file *file, poll_table * wait)
if (is->debug & 0x2)
printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",
if (is->debug & 0x2)
printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",
-
MINOR(file->f_dentry->d_inode->i_rdev
));
+
iminor(file->f_dentry->d_inode
));
/* just registers wait_queue hook. This doesn't really wait. */
poll_wait(file, &is->wq, wait);
/* just registers wait_queue hook. This doesn't really wait. */
poll_wait(file, &is->wq, wait);