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 /arch/ia64/uv/kernel/Makefile | |
| 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 'arch/ia64/uv/kernel/Makefile')
| -rw-r--r-- | arch/ia64/uv/kernel/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile new file mode 100644 index 000000000000..8d92b4684d8e --- /dev/null +++ b/arch/ia64/uv/kernel/Makefile | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | # arch/ia64/uv/kernel/Makefile | ||
| 2 | # | ||
| 3 | # This file is subject to the terms and conditions of the GNU General Public | ||
| 4 | # License. See the file "COPYING" in the main directory of this archive | ||
| 5 | # for more details. | ||
| 6 | # | ||
| 7 | # Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved. | ||
| 8 | # | ||
| 9 | |||
| 10 | EXTRA_CFLAGS += -Iarch/ia64/sn/include | ||
| 11 | |||
| 12 | obj-y += setup.o | ||
| 13 | obj-$(CONFIG_IA64_GENERIC) += machvec.o | ||