[hppa] Update configuration, thanks to Helge Deller (Closes: #738487)

svn path=/dists/trunk/linux/; revision=21049

28 files changed, 44 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index d80c160511be..d62bff869249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ linux (3.13.2-1~exp1) UNRELEASED; urgency=low
     (they were renamed in 3.7)
   * linux-image.postinst: Use lstat() to check symlink existence
     (Closes: #738707)
+  * [hppa] Update configuration, thanks to Helge Deller (Closes: #738487)
+    - megaraid: Enable MEGARAID_NEWGEN as module; disable MEGARAID_LEGACY
+    - drm: Change DRM from module to built-in
+    - [/parisc64-smp] udeb: Add fb-modules package containing radeon driver
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 23 Jan 2014 15:05:08 +0000
 
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 4e2b56a6e66a..33f0e9928011 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -474,7 +474,7 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
+# CONFIG_MEGARAID_LEGACY is not set
 
 ##
 ## file: drivers/scsi/pcmcia/Kconfig
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index cedabe75a570..6e44aec5f63b 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -25,7 +25,9 @@ CONFIG_AGP_PARISC=y
 ## file: drivers/gpu/drm/Kconfig
 ##
 #. for ATI FireGL DRM in C8000 workstation
-CONFIG_DRM=m
+CONFIG_DRM=y
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_TTM=m
 CONFIG_DRM_RADEON=m
 
 ##
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules
new file mode 100644
index 000000000000..677b351f7b98
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/btrfs-modules
@@ -0,0 +1 @@
+#include "../hppa/btrfs-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules
new file mode 100644
index 000000000000..9656269beb64
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/cdrom-core-modules
@@ -0,0 +1 @@
+#include "../hppa/cdrom-core-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules
new file mode 100644
index 000000000000..cb29dfaeefe0
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/core-modules
@@ -0,0 +1 @@
+#include "../hppa/core-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules
new file mode 100644
index 000000000000..ed740a5513f1
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-dm-modules
@@ -0,0 +1 @@
+#include "../hppa/crypto-dm-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules
new file mode 100644
index 000000000000..1c4d2d0cf592
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/crypto-modules
@@ -0,0 +1 @@
+#include "../hppa/crypto-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules
new file mode 100644
index 000000000000..00920ace1118
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/ext4-modules
@@ -0,0 +1 @@
+#include "../hppa/ext4-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules
new file mode 100644
index 000000000000..ef6dd33ff50d
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/fat-modules
@@ -0,0 +1 @@
+#include "../hppa/fat-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules
new file mode 100644
index 000000000000..acaf53bbaa51
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/fb-modules
@@ -0,0 +1,6 @@
+drm ?
+drm_kms_helper ?
+radeon ?
+ttm ?
+
+
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules
new file mode 100644
index 000000000000..06f8ccf63172
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/fuse-modules
@@ -0,0 +1 @@
+#include "../hppa/fuse-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules
new file mode 100644
index 000000000000..cdeaa30fed3e
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/input-modules
@@ -0,0 +1 @@
+#include "../hppa/input-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image b/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
new file mode 100644
index 000000000000..1bb8bf6d7fd4
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/kernel-image
@@ -0,0 +1 @@
+# empty
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules
new file mode 100644
index 000000000000..721ffecf45e4
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/loop-modules
@@ -0,0 +1 @@
+#include "../hppa/loop-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules
new file mode 100644
index 000000000000..d7e97202280e
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/md-modules
@@ -0,0 +1 @@
+#include "../hppa/md-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules
new file mode 100644
index 000000000000..46f68a37a48f
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/multipath-modules
@@ -0,0 +1 @@
+#include "../hppa/multipath-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules
new file mode 100644
index 000000000000..b4c4622c7318
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/nbd-modules
@@ -0,0 +1 @@
+#include "../hppa/nbd-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules
new file mode 100644
index 000000000000..e15b2d573904
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/nic-modules
@@ -0,0 +1 @@
+#include "../hppa/nic-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules
new file mode 100644
index 000000000000..46bc71900e6d
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/pata-modules
@@ -0,0 +1 @@
+#include "../hppa/pata-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules
new file mode 100644
index 000000000000..b78085c3487e
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/ppp-modules
@@ -0,0 +1 @@
+#include "../hppa/ppp-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules
new file mode 100644
index 000000000000..ff84a7089d9b
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-core-modules
@@ -0,0 +1 @@
+#include "../hppa/scsi-core-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules
new file mode 100644
index 000000000000..229e060a8f07
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/scsi-modules
@@ -0,0 +1 @@
+#include "../hppa/scsi-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules
new file mode 100644
index 000000000000..df2abbbd9f3c
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/usb-modules
@@ -0,0 +1 @@
+#include "../hppa/usb-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules
new file mode 100644
index 000000000000..5562ed4c879e
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/usb-storage-modules
@@ -0,0 +1 @@
+#include "../hppa/usb-storage-modules"
diff --git a/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules b/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules
new file mode 100644
index 000000000000..b3f829cf2dd1
--- /dev/null
+++ b/debian/installer/hppa/modules/hppa-parisc64-smp/zlib-modules
@@ -0,0 +1 @@
+#include "../hppa/zlib-modules"
diff --git a/debian/installer/hppa/modules/hppa/scsi-modules b/debian/installer/hppa/modules/hppa/scsi-modules
index 0f18fba7c750..2c200820dfd2 100644
--- a/debian/installer/hppa/modules/hppa/scsi-modules
+++ b/debian/installer/hppa/modules/hppa/scsi-modules
@@ -6,7 +6,10 @@ sg
 st
 sym53c8xx
 zalon7xx
-megaraid
+megaraid ?
+megaraid_mbox ?
+megaraid_mm ?
+megaraid_sas ?
 qlogicfas408
 mptbase
 mptspi
diff --git a/debian/installer/hppa/package-list b/debian/installer/hppa/package-list
index a9acbccc6aa3..22d182a93734 100644
--- a/debian/installer/hppa/package-list
+++ b/debian/installer/hppa/package-list
@@ -13,3 +13,7 @@ Depends: kernel-image, ide-core-modules, nls-core-modules
 
 Package: pata-modules
 Depends: kernel-image, scsi-core-modules
+
+Package: fb-modules
+Depends: kernel-image
+Priority: standard