diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/blackfin/include/asm/setup.h | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/blackfin/include/asm/setup.h')
| -rw-r--r-- | arch/blackfin/include/asm/setup.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/setup.h b/arch/blackfin/include/asm/setup.h new file mode 100644 index 000000000000..01c8c6cbe6fc --- /dev/null +++ b/arch/blackfin/include/asm/setup.h | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | ** asm/setup.h -- Definition of the Linux/bfin setup information | ||
| 3 | ** | ||
| 4 | ** This file is subject to the terms and conditions of the GNU General Public | ||
| 5 | ** License. See the file COPYING in the main directory of this archive | ||
| 6 | ** for more details. | ||
| 7 | ** | ||
| 8 | ** Copyright Lineo, Inc 2001 Tony Kou | ||
| 9 | ** | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef _BFIN_SETUP_H | ||
| 13 | #define _BFIN_SETUP_H | ||
| 14 | |||
| 15 | #define COMMAND_LINE_SIZE 512 | ||
| 16 | |||
| 17 | #endif /* _BFIN_SETUP_H */ | ||