diff options
author | David S. Miller | 2008-05-15 09:34:44 +0200 |
---|---|---|
committer | David S. Miller | 2008-05-15 09:34:44 +0200 |
commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /arch/blackfin/kernel/fixed_code.S | |
parent | Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/j... (diff) | |
parent | isdn/capi: Return proper errnos on module init. (diff) | |
download | kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.gz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.xz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'arch/blackfin/kernel/fixed_code.S')
-rw-r--r-- | arch/blackfin/kernel/fixed_code.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/fixed_code.S b/arch/blackfin/kernel/fixed_code.S index 5ed47228a390..4b03ba025488 100644 --- a/arch/blackfin/kernel/fixed_code.S +++ b/arch/blackfin/kernel/fixed_code.S @@ -1,6 +1,6 @@ /* * This file contains sequences of code that will be copied to a - * fixed location, defined in <asm/atomic_seq.h>. The interrupt + * fixed location, defined in <asm/fixed_code.h>. The interrupt * handlers ensure that these sequences appear to be atomic when * executed from userspace. * These are aligned to 16 bytes, so that we have some space to replace |