diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /include/asm-cris/bug.h | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'include/asm-cris/bug.h')
| -rw-r--r-- | include/asm-cris/bug.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-cris/bug.h b/include/asm-cris/bug.h deleted file mode 100644 index fee12d4ae683..000000000000 --- a/include/asm-cris/bug.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #ifndef _CRIS_BUG_H | ||
| 2 | #define _CRIS_BUG_H | ||
| 3 | #include <asm/arch/bug.h> | ||
| 4 | #endif | ||