Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / include / linux / shm.h

diff --git a/include/linux/shm.h b/include/linux/shm.h
index bea65d9c93ef1c9da525bf5c6fb79a206f2e51f7..eeaed921a1dc02d02f3a61cec5ea0c62873ecfad 100644 (file)
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -79,7 +79,6 @@ struct shmid_kernel /* private to the kernel */
 {      
        struct kern_ipc_perm    shm_perm;
        struct file *           shm_file;
-       int                     id;
        unsigned long           shm_nattch;
        unsigned long           shm_segsz;
        time_t                  shm_atim;