diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
| commit | 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 (patch) | |
| tree | c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 /include/asm-cris/system.h | |
| parent | 84ac69e8bf9f36eb0166817373336d14fa58f5cc (diff) | |
| parent | aec5c3c1a929d7d79a420e943285cf3ba26a7c0d (diff) | |
| download | talos-op-linux-4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99.tar.gz talos-op-linux-4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99.zip | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'include/asm-cris/system.h')
| -rw-r--r-- | include/asm-cris/system.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h index d48670107a85..1d63c2aa8ec2 100644 --- a/include/asm-cris/system.h +++ b/include/asm-cris/system.h @@ -71,4 +71,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz #define arch_align_stack(x) (x) +void default_idle(void); + #endif |
