---

yaml --- r: 337981 b: refs/heads/master c: 05e5027 h: refs/heads/master i: 337979: 2dc78e8 v: v3
git-mirror · Nov 16, 2012 · 700ee96 · 700ee96
1 parent 24d7305
commit 700ee96
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76859725ad31ac480d55bf176e5bbe0f9ab6e6cb
+refs/heads/master: 05e5027efc9c0bb6d1d04cde279afbafca0a7929
diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -156,4 +156,6 @@ source "drivers/pwm/Kconfig"
 
 source "drivers/irqchip/Kconfig"
 
+source "drivers/ipack/Kconfig"
+
 endmenu
diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
@@ -145,3 +145,4 @@ obj-$(CONFIG_EXTCON)		+= extcon/
 obj-$(CONFIG_MEMORY)		+= memory/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_VME_BUS)		+= vme/
+obj-$(CONFIG_IPACK_BUS)		+= ipack/
diff --git a/trunk/drivers/staging/ipack/Kconfig → trunk/drivers/ipack/Kconfig b/trunk/drivers/staging/ipack/Kconfig → trunk/drivers/ipack/Kconfig
@@ -17,8 +17,8 @@ menuconfig IPACK_BUS
 
 if IPACK_BUS
 
-source "drivers/staging/ipack/carriers/Kconfig"
+source "drivers/ipack/carriers/Kconfig"
 
-source "drivers/staging/ipack/devices/Kconfig"
+source "drivers/ipack/devices/Kconfig"
 
 endif # IPACK
diff --git a/trunk/drivers/staging/ipack/Makefile → trunk/drivers/ipack/Makefile b/trunk/drivers/staging/ipack/Makefile → trunk/drivers/ipack/Makefile
diff --git a/trunk/drivers/staging/ipack/carriers/Kconfig → trunk/drivers/ipack/carriers/Kconfig b/trunk/drivers/staging/ipack/carriers/Kconfig → trunk/drivers/ipack/carriers/Kconfig
diff --git a/...k/drivers/staging/ipack/carriers/Makefile → trunk/drivers/ipack/carriers/Makefile b/...k/drivers/staging/ipack/carriers/Makefile → trunk/drivers/ipack/carriers/Makefile
diff --git a/.../drivers/staging/ipack/carriers/tpci200.c → trunk/drivers/ipack/carriers/tpci200.c b/.../drivers/staging/ipack/carriers/tpci200.c → trunk/drivers/ipack/carriers/tpci200.c
diff --git a/.../drivers/staging/ipack/carriers/tpci200.h → trunk/drivers/ipack/carriers/tpci200.h b/.../drivers/staging/ipack/carriers/tpci200.h → trunk/drivers/ipack/carriers/tpci200.h
diff --git a/trunk/drivers/staging/ipack/devices/Kconfig → trunk/drivers/ipack/devices/Kconfig b/trunk/drivers/staging/ipack/devices/Kconfig → trunk/drivers/ipack/devices/Kconfig
diff --git a/trunk/drivers/staging/ipack/devices/Makefile → trunk/drivers/ipack/devices/Makefile b/trunk/drivers/staging/ipack/devices/Makefile → trunk/drivers/ipack/devices/Makefile
diff --git a/...k/drivers/staging/ipack/devices/ipoctal.c → trunk/drivers/ipack/devices/ipoctal.c b/...k/drivers/staging/ipack/devices/ipoctal.c → trunk/drivers/ipack/devices/ipoctal.c
diff --git a/...k/drivers/staging/ipack/devices/ipoctal.h → trunk/drivers/ipack/devices/ipoctal.h b/...k/drivers/staging/ipack/devices/ipoctal.h → trunk/drivers/ipack/devices/ipoctal.h
diff --git a/...k/drivers/staging/ipack/devices/scc2698.h → trunk/drivers/ipack/devices/scc2698.h b/...k/drivers/staging/ipack/devices/scc2698.h → trunk/drivers/ipack/devices/scc2698.h
diff --git a/trunk/drivers/staging/ipack/ipack.c → trunk/drivers/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c → trunk/drivers/ipack/ipack.c
diff --git a/trunk/drivers/staging/ipack/ipack.h → trunk/drivers/ipack/ipack.h b/trunk/drivers/staging/ipack/ipack.h → trunk/drivers/ipack/ipack.h
diff --git a/trunk/drivers/staging/ipack/ipack_ids.h → trunk/drivers/ipack/ipack_ids.h b/trunk/drivers/staging/ipack/ipack_ids.h → trunk/drivers/ipack/ipack_ids.h
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -122,8 +122,6 @@ source "drivers/staging/ozwpan/Kconfig"
 
 source "drivers/staging/ccg/Kconfig"
 
-source "drivers/staging/ipack/Kconfig"
-
 source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/csr/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/
 obj-$(CONFIG_VT6655)		+= vt6655/
 obj-$(CONFIG_VT6656)		+= vt6656/
 obj-$(CONFIG_VME_BUS)		+= vme/
-obj-$(CONFIG_IPACK_BUS)		+= ipack/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_ZRAM)		+= zram/

diff --git a/trunk/drivers/staging/ipack/TODO b/trunk/drivers/staging/ipack/TODO
Original file line number	Diff line number	Diff line change
Expand Up		@@ -156,4 +156,6 @@ source "drivers/pwm/Kconfig"

		source "drivers/irqchip/Kconfig"

		source "drivers/ipack/Kconfig"

		endmenu