diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /net/802 | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'net/802')
| -rw-r--r-- | net/802/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/802/Makefile b/net/802/Makefile index 0186192959..977704a54f 100644 --- a/net/802/Makefile +++ b/net/802/Makefile | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | # Makefile for the Linux 802.x protocol layers. | 2 | # Makefile for the Linux 802.x protocol layers. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := p8023.o | ||
| 6 | |||
| 7 | # Check the p8022 selections against net/core/Makefile. | 5 | # Check the p8022 selections against net/core/Makefile. |
| 8 | obj-$(CONFIG_SYSCTL) += sysctl_net_802.o | 6 | obj-$(CONFIG_SYSCTL) += sysctl_net_802.o |
| 9 | obj-$(CONFIG_LLC) += p8022.o psnap.o | 7 | obj-$(CONFIG_LLC) += p8022.o psnap.o |
| @@ -11,5 +9,5 @@ obj-$(CONFIG_TR) += p8022.o psnap.o tr.o sysctl_net_802.o | |||
| 11 | obj-$(CONFIG_NET_FC) += fc.o | 9 | obj-$(CONFIG_NET_FC) += fc.o |
| 12 | obj-$(CONFIG_FDDI) += fddi.o | 10 | obj-$(CONFIG_FDDI) += fddi.o |
| 13 | obj-$(CONFIG_HIPPI) += hippi.o | 11 | obj-$(CONFIG_HIPPI) += hippi.o |
| 14 | obj-$(CONFIG_IPX) += p8022.o psnap.o | 12 | obj-$(CONFIG_IPX) += p8022.o psnap.o p8023.o |
| 15 | obj-$(CONFIG_ATALK) += p8022.o psnap.o | 13 | obj-$(CONFIG_ATALK) += p8022.o psnap.o |