diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 00:51:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-14 00:51:36 -0800 |
| commit | 13c0ce8554d1a0914b7fe887cbf7fe81974c09da (patch) | |
| tree | 9a0f4eca8a9549f397f2f3d8da8dce5e8f088aa8 /include/linux | |
| parent | 51a43a9afede2f9ee10ea30098de6596176dfad8 (diff) | |
| parent | 41f84493d7bb1d0e8e35be75f467eea60b4c3bef (diff) | |
Merge master.kernel.org:/home/hch/BK/xfs/linux-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/miscdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/xattr.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 396d4178b14c..b7b3da409f8a 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -18,6 +18,7 @@ #define RTC_MINOR 135 #define EFI_RTC_MINOR 136 /* EFI Time services */ #define SUN_OPENPROM_MINOR 139 +#define DMAPI_MINOR 140 /* DMAPI */ #define NVRAM_MINOR 144 #define I2O_MINOR 166 #define MICROCODE_MINOR 184 diff --git a/include/linux/xattr.h b/include/linux/xattr.h index a7eb1b4188bd..9e967b58ee2e 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -4,7 +4,7 @@ Extended attributes handling. Copyright (C) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org> - Copyright (C) 2001 SGI - Silicon Graphics, Inc <linux-xfs@oss.sgi.com> + Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. */ #ifndef _LINUX_XATTR_H #define _LINUX_XATTR_H |