diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /include/asm-sparc64/shmparam.h | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'include/asm-sparc64/shmparam.h')
| -rw-r--r-- | include/asm-sparc64/shmparam.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h index 8c66fded8a32..1ed0d6701a9b 100644 --- a/include/asm-sparc64/shmparam.h +++ b/include/asm-sparc64/shmparam.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */ | ||
| 2 | #ifndef _ASMSPARC64_SHMPARAM_H | 1 | #ifndef _ASMSPARC64_SHMPARAM_H |
| 3 | #define _ASMSPARC64_SHMPARAM_H | 2 | #define _ASMSPARC64_SHMPARAM_H |
| 4 | 3 | ||