diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 08:44:08 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 08:44:08 +0100 |
commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /net/caif/cfcnfg.c | |
parent | sh: update sh7757lcr_defconfig (diff) | |
parent | Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz linux-1d2a1959fe534279cf37aba20b08c24c20840e52.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'net/caif/cfcnfg.c')
-rw-r--r-- | net/caif/cfcnfg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index c665de778b60..f1f98d967d8a 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c @@ -23,10 +23,8 @@ #include <asm/atomic.h> #define MAX_PHY_LAYERS 7 -#define PHY_NAME_LEN 20 #define container_obj(layr) container_of(layr, struct cfcnfg, layer) -#define RFM_FRAGMENT_SIZE 4030 /* Information about CAIF physical interfaces held by Config Module in order * to manage physical interfaces |