diff options
| author | David S. Miller | 2008-08-30 08:06:00 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-08-30 08:06:00 +0200 |
| commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
| tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /include/linux/Kbuild | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | net: Unbreak userspace usage of linux/mroute.h (diff) | |
| download | kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.tar.gz kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.tar.xz kernel-qcow2-linux-b171e19ed08c8ba832e5325fadf1be493f56665d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 7d970678f940..59391250d51c 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -297,7 +297,6 @@ unifdef-y += parport.h unifdef-y += patchkey.h unifdef-y += pci.h unifdef-y += personality.h -unifdef-y += pim.h unifdef-y += pktcdvd.h unifdef-y += pmu.h unifdef-y += poll.h |