diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2014-07-14 17:08:29 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-10-06 08:22:00 +0200 |
| commit | 82210dfb2c489680c99af5e4acb68f8712a49357 (patch) | |
| tree | 09009faba0369bd196c195b3e03e3fe78d553558 | |
| parent | 5e102d1f7260e8264d1bc8c28e8de163fbab88a8 (diff) | |
| download | lwn-82210dfb2c489680c99af5e4acb68f8712a49357.tar.gz lwn-82210dfb2c489680c99af5e4acb68f8712a49357.zip | |
CRIS: Fix headers_install
commit 6eb64b8c64f7177b160b4bdbabd317d523bf4bfc upstream.
Fix headers_install by adjusting the path to arch files.
And delete unused Kbuild file.
Drop special handling of cris in the headers.sh script
as a nice side-effect.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 4 | ||||
| -rw-r--r-- | arch/cris/include/uapi/asm/Kbuild | 4 | ||||
| -rwxr-xr-x | scripts/headers.sh | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 497776e4777d..874f77c4dd7b 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -1,8 +1,4 @@ -header-y += arch-v10/ -header-y += arch-v32/ - - generic-y += clkdev.h generic-y += exec.h generic-y += kvm_para.h diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild index 7d47b366ad82..01f66b8f15e5 100644 --- a/arch/cris/include/uapi/asm/Kbuild +++ b/arch/cris/include/uapi/asm/Kbuild @@ -1,8 +1,8 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += arch-v10/ -header-y += arch-v32/ +header-y += ../arch-v10/arch/ +header-y += ../arch-v32/arch/ header-y += auxvec.h header-y += bitsperlong.h header-y += byteorder.h diff --git a/scripts/headers.sh b/scripts/headers.sh index 978b42b3acd7..9c0836faf46d 100755 --- a/scripts/headers.sh +++ b/scripts/headers.sh @@ -19,8 +19,6 @@ for arch in ${archs}; do case ${arch} in um) # no userspace export ;; - cris) # headers export are known broken - ;; *) if [ -d ${srctree}/arch/${arch} ]; then do_command $1 ${arch} |