Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[powerpc.git] / include / linux / ncp_mount.h

diff --git a/include/linux/ncp_mount.h b/include/linux/ncp_mount.h
index f46bddc..a2b549e 100644 (file)
--- a/include/linux/ncp_mount.h
+++ b/include/linux/ncp_mount.h
@@ -75,7 +75,7 @@ struct ncp_mount_data_kernel {
        unsigned int     int_flags;     /* internal flags */
 #define NCP_IMOUNT_LOGGEDIN_POSSIBLE   0x0001
        __kernel_uid32_t mounted_uid;   /* Who may umount() this filesystem? */
-       __kernel_pid_t   wdog_pid;              /* Who cares for our watchdog packets? */
+       struct pid      *wdog_pid;      /* Who cares for our watchdog packets? */
        unsigned int     ncp_fd;        /* The socket to the ncp port */
        unsigned int     time_out;      /* How long should I wait after
                                           sending a NCP request? */