diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /include/asm-sparc64/sections.h | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'include/asm-sparc64/sections.h')
| -rw-r--r-- | include/asm-sparc64/sections.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-sparc64/sections.h b/include/asm-sparc64/sections.h deleted file mode 100644 index 3f4b9fdc28d..00000000000 --- a/include/asm-sparc64/sections.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | #ifndef _SPARC64_SECTIONS_H | ||
| 2 | #define _SPARC64_SECTIONS_H | ||
| 3 | |||
| 4 | /* nothing to see, move along */ | ||
| 5 | #include <asm-generic/sections.h> | ||
| 6 | |||
| 7 | extern char _start[]; | ||
| 8 | |||
| 9 | #endif | ||