diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /fs/xfs/quota/xfs_qm.h | |
| parent | [IA64] Increase max physical address for SN platforms (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-344a076110f4ecb16ea6d286b63be696604982ed.tar.xz linux-344a076110f4ecb16ea6d286b63be696604982ed.zip | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'fs/xfs/quota/xfs_qm.h')
| -rw-r--r-- | fs/xfs/quota/xfs_qm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/quota/xfs_qm.h b/fs/xfs/quota/xfs_qm.h index b03eecf3b6cb..0b00b3c67015 100644 --- a/fs/xfs/quota/xfs_qm.h +++ b/fs/xfs/quota/xfs_qm.h @@ -184,8 +184,6 @@ typedef struct xfs_dquot_acct { #define XFS_QM_HOLD(xqm) ((xqm)->qm_nrefs++) #define XFS_QM_RELE(xqm) ((xqm)->qm_nrefs--) -extern void xfs_mount_reset_sbqflags(xfs_mount_t *); - extern void xfs_qm_destroy_quotainfo(xfs_mount_t *); extern int xfs_qm_mount_quotas(xfs_mount_t *, int); extern void xfs_qm_mount_quotainit(xfs_mount_t *, uint); |