Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 291603cc authored by Don Zickus's avatar Don Zickus Committed by Greg Kroah-Hartman
Browse files

staging: unisys: Move visorchannel into visorbus 



visorchannel seems to be a necessary component to visorbus and can never
function as a standalone module.  Let's treat it like a visorbus feature
that is always enabled.

Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3703987c

drivers/staging/unisys/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ menuconfig UNISYSSPAR 
if UNISYSSPAR



source "drivers/staging/unisys/visorutil/Kconfig"

source "drivers/staging/unisys/visorchannel/Kconfig"

source "drivers/staging/unisys/visorchipset/Kconfig"

source "drivers/staging/unisys/visorbus/Kconfig"

drivers/staging/unisys/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,6 +2,5 @@ 
# Makefile for Unisys SPAR drivers

#

obj-$(CONFIG_UNISYS_VISORUTIL)		+= visorutil/

obj-$(CONFIG_UNISYS_VISORCHANNEL)	+= visorchannel/

obj-$(CONFIG_UNISYS_VISORCHIPSET)	+= visorchipset/

obj-$(CONFIG_UNISYS_VISORBUS)		+= visorbus/

drivers/staging/unisys/visorbus/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


config UNISYS_VISORBUS

	tristate "Unisys visorbus driver"

	depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHANNEL && UNISYS_VISORCHIPSET

	depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHIPSET

	---help---

	If you say Y here, you will enable the Unisys visorbus driver.

drivers/staging/unisys/visorbus/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus.o



visorbus-y := visorbus_main.o devmajorminor_attr.o businst_attr.o channel_attr.o

visorbus-y	+= visorchannel_funcs.o



ccflags-y += -Idrivers/staging/unisys/include

ccflags-y += -Idrivers/staging/unisys/visorchannel

ccflags-y += -Idrivers/staging/unisys/visorchipset

ccflags-y += -Idrivers/staging/unisys/common-spar/include

ccflags-y += -Idrivers/staging/unisys/common-spar/include/channels

drivers/staging/unisys/visorbus/globals.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* globals.h

 *

 * Copyright (C) 2010 - 2013 UNISYS CORPORATION

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 * NON INFRINGEMENT.  See the GNU General Public License for more

 * details.

 */



#ifndef __VISORCHANNEL_GLOBALS_H__

#define __VISORCHANNEL_GLOBALS_H__



#include "timskmod.h"

#include "memregion.h"

#include "version.h"



#define MYDRVNAME "visorchannel"



#endif